diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-04 10:14:15 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-04 10:14:15 +0000 |
commit | 38e66f62907569b1ab1ad89112f943c6aa0aa0b2 (patch) | |
tree | 8023ad330853db129f0f4dcedb4227526870c63b /TAO/tao | |
parent | 7ceed13ff256d46e7ffd8452ea2e893247d21abf (diff) | |
download | ATCD-38e66f62907569b1ab1ad89112f943c6aa0aa0b2.tar.gz |
ChangeLogTag: Tue Jan 4 09:42:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao')
-rw-r--r-- | TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h | 7 | ||||
-rw-r--r-- | TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h | 4 | ||||
-rw-r--r-- | TAO/tao/BiDir_GIOP/BiDir_Policy_i.h | 4 | ||||
-rw-r--r-- | TAO/tao/Makefile.am | 1 | ||||
-rw-r--r-- | TAO/tao/RTCORBA/RT_Current.h | 4 | ||||
-rw-r--r-- | TAO/tao/RTCORBA/RT_Mutex.h | 4 | ||||
-rw-r--r-- | TAO/tao/RTCORBA/RT_ORB.h | 20 | ||||
-rw-r--r-- | TAO/tao/RTCORBA/RT_ORBInitializer.h | 4 | ||||
-rw-r--r-- | TAO/tao/RTCORBA/RT_PolicyFactory.h | 4 | ||||
-rw-r--r-- | TAO/tao/RTCORBA/RT_Policy_i.h | 4 | ||||
-rw-r--r-- | TAO/tao/TSS_Resources.h | 2 | ||||
-rw-r--r-- | TAO/tao/Thread_Lane_Resources_Manager.cpp | 8 | ||||
-rw-r--r-- | TAO/tao/Thread_Lane_Resources_Manager.h | 4 | ||||
-rw-r--r-- | TAO/tao/Thread_Lane_Resources_Manager.i | 1 |
14 files changed, 20 insertions, 51 deletions
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h index e093209c603..0671cf2bbd1 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h @@ -20,16 +20,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -57,12 +54,10 @@ private: }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ - - #include /**/ "ace/post.h" #endif /* TAO_BIDIR_ORB_INITIALIZER_H */ diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h index e931fd20d5d..4f2dcc637d2 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h @@ -27,9 +27,7 @@ // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -48,7 +46,7 @@ public: }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 5c1ad66442c..51c3875ad81 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -27,9 +27,7 @@ #include "tao/LocalObject.h" #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -91,7 +89,7 @@ private: #include "BiDir_Policy_i.inl" #endif /* __ACE_INLINE__ */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 55f3137e89e..63859e83149 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -828,7 +828,6 @@ nobase_include_HEADERS += \ TAO_Singleton_Manager.inl \ Tagged_Components.i \ Tagged_Profile.i \ - Thread_Lane_Resources_Manager.i \ TimeBaseC.inl \ TimeBaseS.inl \ TimeBaseS_T.inl \ diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h index 13b772ee54d..a16feb4bfde 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -30,9 +30,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -77,7 +75,7 @@ private: # include "RT_Current.i" #endif /* __ACE_INLINE__ */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index 33c0d8985e4..c12409e8cd0 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -33,9 +33,7 @@ #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -110,7 +108,7 @@ protected: }; #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 07fddcde91d..1846c41e36d 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -33,9 +33,7 @@ #endif #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -160,14 +158,14 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException )); - RTCORBA::UnixDomainProtocolProperties_ptr + RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties ( CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - - RTCORBA::SharedMemoryProtocolProperties_ptr + + RTCORBA::SharedMemoryProtocolProperties_ptr create_shared_memory_protocol_properties ( CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size, @@ -179,14 +177,14 @@ public: const char *mmap_lockname ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - - RTCORBA::UserDatagramProtocolProperties_ptr + + RTCORBA::UserDatagramProtocolProperties_ptr create_user_datagram_protocol_properties ( CORBA::Boolean enable_network_priority ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - - RTCORBA::StreamControlProtocolProperties_ptr + + RTCORBA::StreamControlProtocolProperties_ptr create_stream_control_protocol_properties ( CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size, @@ -196,7 +194,7 @@ public: CORBA::Boolean enable_network_priority ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + /// Create a RTCORBA threadpool to manage a set of threads without lanes. virtual RTCORBA::ThreadpoolId create_threadpool (CORBA::ULong stacksize, @@ -322,7 +320,7 @@ protected: #include "RT_ORB.i" #endif /* __ACE_INLINE__ */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h index 88950e2394d..d64f3a8ccf9 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.h +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h @@ -34,9 +34,7 @@ // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -123,7 +121,7 @@ private: }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h index 5be40291ac2..078bdfdd440 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.h +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h @@ -33,9 +33,7 @@ // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -58,7 +56,7 @@ public: CORBA::PolicyError)); }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index 211a25b2a35..4dd2533c099 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -33,9 +33,7 @@ #include "ace/SString.h" #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -902,7 +900,7 @@ protected: #include "RT_Policy_i.i" #endif /* __ACE_INLINE__ */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h index d08e5c4ac35..1fb3d2302b0 100644 --- a/TAO/tao/TSS_Resources.h +++ b/TAO/tao/TSS_Resources.h @@ -25,7 +25,7 @@ #include "tao/TAO_Singleton.h" #include "tao/Environment.h" - +#include "tao/TAO_Export.h" /** * @class TAO_TSS_Resources diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp index 7999dad9565..d3864856d85 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp @@ -6,14 +6,10 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (tao, - Thread_Lane_Resources_Manager, +ACE_RCSID (tao, + Thread_Lane_Resources_Manager, "$Id$") -#if !defined (__ACE_INLINE__) -# include "tao/Thread_Lane_Resources_Manager.i" -#endif /* ! __ACE_INLINE__ */ - TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core) : orb_core_ (&orb_core), lf_strategy_ (0) diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index 26891ce85c4..feee9fe7056 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -106,10 +106,6 @@ public: }; -#if defined (__ACE_INLINE__) -# include "tao/Thread_Lane_Resources_Manager.i" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* TAO_THREAD_LANE_RESOURCES_MANAGER_H */ diff --git a/TAO/tao/Thread_Lane_Resources_Manager.i b/TAO/tao/Thread_Lane_Resources_Manager.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/tao/Thread_Lane_Resources_Manager.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ |