diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-04-18 21:09:28 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-04-18 21:09:28 +0000 |
| commit | 947abb26f5aa6c0ffdf676d82710c286edce76e4 (patch) | |
| tree | 28d643172dd4483e49317c2a89acc809fcd5f5cf /TAO/tao/ORB_Table.h | |
| parent | 542e8ac615d8bef7c9e636fafc79a24b65070252 (diff) | |
| download | ATCD-947abb26f5aa6c0ffdf676d82710c286edce76e4.tar.gz | |
ChangeLogTag:Thu Apr 18 14:07:44 2002 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/tao/ORB_Table.h')
| -rw-r--r-- | TAO/tao/ORB_Table.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index d15398febf8..0b1beb7936e 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -29,7 +29,6 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Functor.h" - // Forward declarations. class TAO_ORB_Core; @@ -47,7 +46,7 @@ class TAO_ORB_Core; */ class TAO_Export TAO_ORB_Table { - friend class TAO_Singleton<TAO_ORB_Table, TAO_SYNCH_MUTEX>; + friend class TAO_Export TAO_Singleton<TAO_ORB_Table, TAO_SYNCH_MUTEX>; public: /// destructor @@ -96,34 +95,6 @@ private: # include "tao/ORB_Table.inl" #endif /* __ACE_INLINE__ */ -#if defined (_MSC_VER) -// Disable "nonstandard extension used : 'extern' before template -// explicit instantiation" warning. -#pragma warning(disable:4231) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -# if !defined (TAO_BUILD_DLL) -// The TAO_SINGLETON_DECLARE macro on its own does not work with -// Borland C++. Therefore we use the following pragma to force -// the template specialisation to be exported from the DLL. -# pragma option push -Jgx -# endif -#endif - -TAO_SINGLETON_DECLARE (TAO_Singleton, TAO_ORB_Table, TAO_SYNCH_MUTEX) - -#if defined (__BORLANDC__) -# if !defined(TAO_BUILD_DLL) -# pragma option pop -# endif -#endif - -#if defined (_MSC_VER) -// Re-enable the warning. -#pragma warning(default:4231) -#endif /* _MSC_VER */ - #include "ace/post.h" #endif /* TAO_ORB_TABLE_H */ |