summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstorri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-07-22 18:31:41 +0000
committerstorri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-07-22 18:31:41 +0000
commitc9e42aed6ecdedd9a573380fdfd3e9e559065fe7 (patch)
treebac8969daeec344eff70c956be1a7c0b9f413cee
parent18c3103685e6cd84b6ea2b29bb7817e568b42c91 (diff)
downloadATCD-c9e42aed6ecdedd9a573380fdfd3e9e559065fe7.tar.gz
Fixed _MSC_VER compiler warnings.
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--ace/streams.h4
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e1abaf66fee..647689c8db9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 22 13:25:29 2002 Stephen Torri <storri@cs.wustl.edu>
+
+ * ace/streams.h: Fixed _MSC_VER compiler warning messages stating
+ concern about using MSC_VER without assurance that the macro
+ was defined.
+
Mon Jul 22 12:20:21 2002 Krishnakumar B <kitty@cs.wustl.edu>
* THANKS: Added Sean Ogle to the hall of fame.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e1abaf66fee..647689c8db9 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Mon Jul 22 13:25:29 2002 Stephen Torri <storri@cs.wustl.edu>
+
+ * ace/streams.h: Fixed _MSC_VER compiler warning messages stating
+ concern about using MSC_VER without assurance that the macro
+ was defined.
+
Mon Jul 22 12:20:21 2002 Krishnakumar B <kitty@cs.wustl.edu>
* THANKS: Added Sean Ogle to the hall of fame.
diff --git a/ace/streams.h b/ace/streams.h
index 2425a97969d..bf027a9438c 100644
--- a/ace/streams.h
+++ b/ace/streams.h
@@ -31,7 +31,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
// Do this so the #pragma warning in the MSVC headers do not
// affect our #pragma warning settings
-#if (_MSC_VER >= 1200)
+#if defined (_MSC_VER) && (_MSC_VER >= 1200)
#pragma warning(push)
#endif /* _MSC_VER >= 1200 */
@@ -132,7 +132,7 @@
// Do this so the #pragma warning in the MSVC headers do not
// affect our #pragma warning settings
-#if (_MSC_VER >= 1200)
+#if defined (_MSC_VER) && (_MSC_VER >= 1200)
#pragma warning(pop)
#endif /* _MSC_VER >= 1200 */