diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-10 15:10:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-10 15:10:37 +0000 |
| commit | b6b70c2700da8c2f32b89cc5b54cd48e85642352 (patch) | |
| tree | bc9da229ce1577696c31179755ec0381116997ae /TAO/orbsvcs/tests/LoadBalancing | |
| parent | a493cceb10ba4ea37a53ede04b6b1259b61fbbdb (diff) | |
| download | ATCD-b6b70c2700da8c2f32b89cc5b54cd48e85642352.tar.gz | |
ChangeLogTag: Thu Mar 10 15:03:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs/tests/LoadBalancing')
5 files changed, 11 insertions, 21 deletions
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h index 6e061d588c4..95f1bbb0128 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h @@ -10,9 +10,7 @@ #include "orbsvcs/PortableGroupC.h" #if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ +# pragma warning(push) # pragma warning (disable:4250) #endif /* _MSC_VER */ @@ -55,7 +53,7 @@ private: CORBA::Object_var object_group_; }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h index 5b0513e2e5f..68473814908 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h @@ -10,9 +10,7 @@ #include "ace/Null_Mutex.h" #if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ +# pragma warning(push) #endif /* _MSC_VER */ /// Implement the PortableGroup::GenericFactory Interface. @@ -70,7 +68,7 @@ private: }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h index a7129541c3b..b742f615ab4 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h @@ -8,9 +8,7 @@ #include "TestS.h" #if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ +# pragma warning(push) #endif /* _MSC_VER */ /// Implement the Test::Simple interface @@ -22,13 +20,13 @@ public: Simple (void); /// Constructor - + virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h index c0a82d6a630..45fbc65d101 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h @@ -10,9 +10,7 @@ #include "orbsvcs/PortableGroupC.h" #if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ +# pragma warning(push) # pragma warning (disable:4250) #endif /* _MSC_VER */ @@ -60,7 +58,7 @@ private: CORBA::Short number_; }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h index d023b875a7e..7c3df4e1aa8 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h @@ -10,9 +10,7 @@ #include "orbsvcs/PortableGroupC.h" #if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ +# pragma warning(push) # pragma warning (disable:4250) #endif /* _MSC_VER */ @@ -62,7 +60,7 @@ private: CORBA::Short number_; }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ |