diff options
| author | smcqueen <smcqueen@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-10-27 12:42:52 +0000 |
|---|---|---|
| committer | smcqueen <smcqueen@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-10-27 12:42:52 +0000 |
| commit | 1a503c87e78f87d49047a0ee1f80169b6317ecd6 (patch) | |
| tree | 6b3c3511aa47d4cffe92af527c2644958cdc30ec /TAO/orbsvcs/tests/Bug_2285_Regression | |
| parent | 9e4f5a3c519ad030479ecfcc5c968eda33a2f53c (diff) | |
| download | ATCD-1a503c87e78f87d49047a0ee1f80169b6317ecd6.tar.gz | |
ChangeLogTag: Thu Oct 27 13:36:53 2005 Simon McQueen <sm@prismtech.com>
Diffstat (limited to 'TAO/orbsvcs/tests/Bug_2285_Regression')
5 files changed, 0 insertions, 33 deletions
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h index 1d6904c2b35..4967689c88a 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h @@ -16,7 +16,6 @@ /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h index 2289b58c552..0c2114eeb8f 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h @@ -20,15 +20,6 @@ #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 */ - /// RTCORBA ORB initializer. class Server_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h index 2134d7a18af..e8d05b37085 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h @@ -20,15 +20,6 @@ #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 */ - /// RTCORBA ORB initializer. class Server_ORBInitializer2 : public virtual PortableInterceptor::ORBInitializer, diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h index 139005e7a4a..3b20fda9855 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h @@ -20,13 +20,6 @@ #include "tao/PI/PI.h" #include "tao/PI_Server/PI_Server.h" -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - /** * $Id$ */ diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h index dba286df8cf..9594480b226 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h @@ -21,13 +21,6 @@ #include "tao/PI_Server/PI_Server.h" #include "tao/TimeBaseC.h" -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - /** * $Id$ */ |