summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-02-11 23:57:21 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-02-11 23:57:21 +0000
commit9c9772b670bc4422200f04ad20081d050483aa39 (patch)
tree766095b30d27aa9ed4fd85f9a8a1986ff33a087f
parent89398ff4143cf363161d7970101c3c6d46be3e4b (diff)
downloadATCD-9c9772b670bc4422200f04ad20081d050483aa39.tar.gz
ChangeLogTag: Mon Feb 11 17:56:14 2002 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a9
-rw-r--r--TAO/tao/Base_Transport_Property.h8
-rw-r--r--TAO/tao/Cache_Entries.h7
-rw-r--r--TAO/tao/Policy_Manager.h4
-rw-r--r--TAO/tao/Transport_Cache_Manager.h7
-rw-r--r--TAO/tao/Transport_Descriptor_Interface.h7
6 files changed, 13 insertions, 29 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 588e5d0cb6e..7d7501470f0 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Mon Feb 11 17:56:14 2002 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/Base_Transport_Property.h:
+ * tao/Cache_Entries.h:
+ * tao/Policy_Manager.h:
+ * tao/Transport_Cache_Manager.h:
+ * tao/Transport_Descriptor_Interface.h: Fixed Fuzz errors from
+ #pragma warnings.
+
Mon Feb 11 16:04:20 2002 Balachandran Natarajan <bala@cs.wustl.edu>
* tao/Fault_Tolerance_Service.h:
diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h
index e1b6076fbd0..299a0c6863b 100644
--- a/TAO/tao/Base_Transport_Property.h
+++ b/TAO/tao/Base_Transport_Property.h
@@ -21,14 +21,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 TAO_Base_Transport_Property
*
diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h
index d1a2464d426..a296650d604 100644
--- a/TAO/tao/Cache_Entries.h
+++ b/TAO/tao/Cache_Entries.h
@@ -23,13 +23,6 @@
#include "ace/Recyclable.h"
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
class TAO_Transport;
#ifdef index
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index c1516eb1697..88a79774bf5 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -149,6 +149,10 @@ public:
TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &);
};
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
#if defined (__ACE_INLINE__)
# include "tao/Policy_Manager.i"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Transport_Cache_Manager.h b/TAO/tao/Transport_Cache_Manager.h
index 818bc643a42..402978fe796 100644
--- a/TAO/tao/Transport_Cache_Manager.h
+++ b/TAO/tao/Transport_Cache_Manager.h
@@ -26,13 +26,6 @@
#include "tao/Connection_Purging_Strategy.h"
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
class TAO_ORB_Core;
class ACE_Handle_Set;
class TAO_Resource_Factory;
diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h
index fa540ca1ad8..03bf9d39194 100644
--- a/TAO/tao/Transport_Descriptor_Interface.h
+++ b/TAO/tao/Transport_Descriptor_Interface.h
@@ -21,13 +21,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 TAO_Transport_Descriptor_Interface
*