summaryrefslogtreecommitdiff
path: root/TAO/tao/DynamicAny
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-03-10 14:58:13 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-03-10 14:58:13 +0000
commit31e60113d899837e1d188077ce40bef0638d2121 (patch)
treec01bc1d004e459f8761b50565cbc16ed7c3ee0fe /TAO/tao/DynamicAny
parent5cf8559163ca7251a0f540293efbb53bf2a1ae44 (diff)
downloadATCD-31e60113d899837e1d188077ce40bef0638d2121.tar.gz
ChangeLogTag: Thu Mar 10 14:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/DynamicAny')
-rw-r--r--TAO/tao/DynamicAny/DynAnyFactory.h6
-rw-r--r--TAO/tao/DynamicAny/DynAny_i.h6
-rw-r--r--TAO/tao/DynamicAny/DynArray_i.h6
-rw-r--r--TAO/tao/DynamicAny/DynCommon.h6
-rw-r--r--TAO/tao/DynamicAny/DynEnum_i.h6
-rw-r--r--TAO/tao/DynamicAny/DynSequence_i.h6
-rw-r--r--TAO/tao/DynamicAny/DynStruct_i.h6
-rw-r--r--TAO/tao/DynamicAny/DynUnion_i.h6
8 files changed, 16 insertions, 32 deletions
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 6e239530333..e4b5e99d949 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -25,9 +25,7 @@
#include "tao/LocalObject.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 */
@@ -89,7 +87,7 @@ private:
TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src);
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 5abb47f8540..db9b893ec58 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -26,9 +26,7 @@
#include "tao/LocalObject.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 */
@@ -121,7 +119,7 @@ private:
TAO_DynAny_i &operator= (const TAO_DynAny_i &src);
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index c24bb5f20cd..d8b6120e9cd 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -27,9 +27,7 @@
#include "ace/Containers.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 */
@@ -161,7 +159,7 @@ private:
ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 3e5b5b0eafd..60a15b01d91 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -22,9 +22,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#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 */
@@ -548,7 +546,7 @@ private:
));
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 7f3b8b0ed35..57c68a2f69f 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -27,9 +27,7 @@
#include "ace/Containers.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 */
@@ -152,7 +150,7 @@ private:
CORBA::ULong value_;
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index 8f88136c047..4c0b4f8880a 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -27,9 +27,7 @@
#include "ace/Containers.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 */
@@ -174,7 +172,7 @@ private:
ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index c8e49068fc7..9301e632a5e 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -27,9 +27,7 @@
#include "ace/Containers.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 */
@@ -181,7 +179,7 @@ private:
ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index bbd7fd651de..3052ca6167e 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -26,9 +26,7 @@
#include "tao/LocalObject.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 */
@@ -210,7 +208,7 @@ private:
CORBA::ULong member_slot_;
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif /* _MSC_VER */
View Lorry Controller Status