diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-02-12 00:04:32 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-02-12 00:04:32 +0000 |
| commit | ad761bf80943d06db6c3d3b8796657e436c026d4 (patch) | |
| tree | 29b004d6854ba664300320f141f67b1a61a1bd5d | |
| parent | 9c9772b670bc4422200f04ad20081d050483aa39 (diff) | |
| download | ATCD-ad761bf80943d06db6c3d3b8796657e436c026d4.tar.gz | |
ChangeLogTag: Mon Feb 11 18:02:18 2002 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h | 8 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/POAManager.h | 4 | ||||
| -rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h | 4 | ||||
| -rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/Sender_i.h | 4 |
6 files changed, 22 insertions, 16 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 7d7501470f0..261060f27bf 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Mon Feb 11 18:02:18 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/PortableServer/POAManager.h: + * tests/Oneways_Invoking_Twoways/Receiver_i.h : + * tests/Oneways_Invoking_Twoways/Sender_i.h: + * orbsvcs/tests/FaultTolerance/IOGR/Client_i.h: + * orbsvcs/tests/FaultTolerance/IOGR/Manager.h: More fuzz errors. + + Mon Feb 11 17:56:14 2002 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Base_Transport_Property.h: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h index 00ab0bec940..88f35ea28ca 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h @@ -27,15 +27,6 @@ # pragma once #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 */ - - class Client_i { public: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h index 6e3e2f4d6e3..6bdc3e7cf1c 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h @@ -28,13 +28,6 @@ #include "tao/Object.h" -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class Manager { public: @@ -69,4 +62,5 @@ private: CORBA::Object_var merged_set_; // The merged IOR set }; + #endif /*TEST_FT_IOGR_MANAGER_H */ diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 1cfd090d925..b7b8888b80d 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -153,6 +153,10 @@ protected: }; +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #if defined (__ACE_INLINE__) # include "POAManager.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index 3a8df239209..578a5c4668d 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -62,5 +62,9 @@ private: CORBA::ULong no_calls_; }; +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #include "ace/post.h" #endif /*TAO_TESTS_ONEWAYS_INVOKING_TWOWAYS_RECEIVER_I_H*/ diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index fffc668d58b..306a6189e02 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -63,5 +63,9 @@ private: CORBA::Short active_objects_; }; +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #include "ace/post.h" #endif /*TAO_TESTS_ONEWAYS_INVOKING_TWOWAYS_SENDER_I_H*/ |