diff options
author | bala <balanatarajan@users.noreply.github.com> | 2002-02-12 00:21:56 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2002-02-12 00:21:56 +0000 |
commit | b7f9d7cd9936c42376552b91e4314a5b8a9ce53d (patch) | |
tree | 88c28ab1295e9ab6c6c0c8d2d67fbb910b87123c | |
parent | ad761bf80943d06db6c3d3b8796657e436c026d4 (diff) | |
download | ATCD-b7f9d7cd9936c42376552b91e4314a5b8a9ce53d.tar.gz |
ChangeLogTag: Mon Feb 11 18:20:33 2002 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
-rw-r--r-- | TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h | 4 | ||||
-rw-r--r-- | TAO/tao/PortableServer/ObjectReferenceFactory.h | 4 | ||||
-rw-r--r-- | TAO/tao/PortableServer/ObjectReferenceTemplate.h | 5 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.h | 4 | ||||
-rw-r--r-- | TAO/tests/ORT/ORT_test_IORInterceptor.h | 4 |
6 files changed, 28 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 261060f27bf..31576013265 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Mon Feb 11 18:20:33 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/ORT/ORT_test_IORInterceptor.h: + * orbsvcs/examples/ORT/Server_IORInterceptor.h: + * tao/PortableServer/Object_Adapter.h: + * tao/PortableServer/ObjectReferenceFactory.h: + * tao/PortableServer/ObjectReferenceTemplate.h: More fuzz errors. + Mon Feb 11 18:02:18 2002 Balachandran Natarajan <bala@cs.wustl.edu> * tao/PortableServer/POAManager.h: diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h index 0ca90dca802..b86094c813e 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h @@ -76,4 +76,8 @@ class Server_IORInterceptor : }; +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #endif /* SERVER_IORINTERCEPTOR_H */ diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.h b/TAO/tao/PortableServer/ObjectReferenceFactory.h index 74c5d630c38..184f2cee1df 100644 --- a/TAO/tao/PortableServer/ObjectReferenceFactory.h +++ b/TAO/tao/PortableServer/ObjectReferenceFactory.h @@ -73,6 +73,10 @@ class TAO_PortableServer_Export TAO_ObjectReferenceFactory CORBA::ULong make_object_invoker_; }; +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #include "ace/post.h" #endif /* TAO_OBJECT_REFERENCE_FACTORY_H */ diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h index 3931640a0d5..2aedd5cbfd6 100644 --- a/TAO/tao/PortableServer/ObjectReferenceTemplate.h +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h @@ -83,6 +83,9 @@ private: }; -#include "ace/post.h" +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ +#include "ace/post.h" #endif /* TAO_OBJECT_REFERENCE_TEMPLATE_H */ diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index b75ba21b3c3..f2e9d609fb1 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -789,6 +789,10 @@ ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory) // **************************************************************** +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #if defined (__ACE_INLINE__) # include "Object_Adapter.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h index cbfd83f23c9..726b622c12c 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.h +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h @@ -75,4 +75,8 @@ class ORT_test_IORInterceptor : CORBA::Long components_establish_count_; }; +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #endif /* ORT_TEST_IORINTERCEPTOR_H */ |