summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog27
-rw-r--r--ChangeLogs/ChangeLog-02a27
-rw-r--r--ChangeLogs/ChangeLog-03a27
-rw-r--r--ace/Future.cpp2
-rw-r--r--ace/Future.h6
-rw-r--r--ace/Future_Set.cpp2
-rw-r--r--ace/Future_Set.h8
-rw-r--r--ace/LOCK_SOCK_Acceptor.cpp4
-rw-r--r--ace/config-pharlap.h2
-rw-r--r--ace/streams.h13
10 files changed, 106 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index bd982a558b2..1f9270d681d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Wed May 17 16:20:30 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/Future.cpp:
+ * ace/Future.h:
+ * ace/Future_Set.cpp:
+ * ace/Future_Set.h:
+ * ace/LOCK_SOCK_Acceptor.cpp:
+ * ace/config-pharlap.h:
+
+ While searching for the cause of a warning being undisabled,
+ I noticed there were several places where we were using
+ #include /**/ "ace/some-header.h". The #include /**/ is only
+ for system headers, so it doesn't need to be used with ACE
+ headers.
+
+ * ace/streams.h:
+
+ If ACE_HAS_STANDARD_CPP_LIBRARY is defined, then we include
+ the .h-less versions of the header files. This is all fine
+ and good, except that these headers in MSVC will disable some
+ warnings with #pragma warning, but then set them back to
+ default at the end. So if we disabled a warning in the config
+ file, it would get reenabled because of these headers.
+
+ So I added a #pragma warning(push/pop) pair around the includes
+ in this file to localize the warning settings.
+
Wed May 17 14:32:50 2000 Carlos O'Ryan <coryan@uci.edu>
* tests/CDR_Array_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index bd982a558b2..1f9270d681d 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,30 @@
+Wed May 17 16:20:30 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/Future.cpp:
+ * ace/Future.h:
+ * ace/Future_Set.cpp:
+ * ace/Future_Set.h:
+ * ace/LOCK_SOCK_Acceptor.cpp:
+ * ace/config-pharlap.h:
+
+ While searching for the cause of a warning being undisabled,
+ I noticed there were several places where we were using
+ #include /**/ "ace/some-header.h". The #include /**/ is only
+ for system headers, so it doesn't need to be used with ACE
+ headers.
+
+ * ace/streams.h:
+
+ If ACE_HAS_STANDARD_CPP_LIBRARY is defined, then we include
+ the .h-less versions of the header files. This is all fine
+ and good, except that these headers in MSVC will disable some
+ warnings with #pragma warning, but then set them back to
+ default at the end. So if we disabled a warning in the config
+ file, it would get reenabled because of these headers.
+
+ So I added a #pragma warning(push/pop) pair around the includes
+ in this file to localize the warning settings.
+
Wed May 17 14:32:50 2000 Carlos O'Ryan <coryan@uci.edu>
* tests/CDR_Array_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index bd982a558b2..1f9270d681d 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,30 @@
+Wed May 17 16:20:30 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/Future.cpp:
+ * ace/Future.h:
+ * ace/Future_Set.cpp:
+ * ace/Future_Set.h:
+ * ace/LOCK_SOCK_Acceptor.cpp:
+ * ace/config-pharlap.h:
+
+ While searching for the cause of a warning being undisabled,
+ I noticed there were several places where we were using
+ #include /**/ "ace/some-header.h". The #include /**/ is only
+ for system headers, so it doesn't need to be used with ACE
+ headers.
+
+ * ace/streams.h:
+
+ If ACE_HAS_STANDARD_CPP_LIBRARY is defined, then we include
+ the .h-less versions of the header files. This is all fine
+ and good, except that these headers in MSVC will disable some
+ warnings with #pragma warning, but then set them back to
+ default at the end. So if we disabled a warning in the config
+ file, it would get reenabled because of these headers.
+
+ So I added a #pragma warning(push/pop) pair around the includes
+ in this file to localize the warning settings.
+
Wed May 17 14:32:50 2000 Carlos O'Ryan <coryan@uci.edu>
* tests/CDR_Array_Test.cpp:
diff --git a/ace/Future.cpp b/ace/Future.cpp
index d46455ef291..f70f8df83bb 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -3,7 +3,7 @@
#ifndef ACE_FUTURE_CPP
#define ACE_FUTURE_CPP
-#include /**/ "ace/Future.h"
+#include "ace/Future.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/ace/Future.h b/ace/Future.h
index fcb62306ff6..6abbc5d9a55 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -21,9 +21,9 @@
#define ACE_FUTURE_H
#include "ace/pre.h"
-#include /**/ "ace/Containers.h"
-#include /**/ "ace/Synch.h"
-#include /**/ "ace/Strategies_T.h"
+#include "ace/Containers.h"
+#include "ace/Synch.h"
+#include "ace/Strategies_T.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/ace/Future_Set.cpp b/ace/Future_Set.cpp
index 42480cd8f2d..5b0069fac4f 100644
--- a/ace/Future_Set.cpp
+++ b/ace/Future_Set.cpp
@@ -4,7 +4,7 @@
#ifndef ACE_FUTURE_SET_CPP
#define ACE_FUTURE_SET_CPP
-#include /**/ "ace/Future_Set.h"
+#include "ace/Future_Set.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
index a96dfd7b2dd..eaecada4dc3 100644
--- a/ace/Future_Set.h
+++ b/ace/Future_Set.h
@@ -18,10 +18,10 @@
#define ACE_FUTURE_SET_H
#include "ace/pre.h"
-#include /**/ "ace/Thread.h"
-#include /**/ "ace/Message_Queue.h"
-#include /**/ "ace/Future.h"
-#include /**/ "ace/Hash_Map_Manager.h"
+#include "ace/Thread.h"
+#include "ace/Message_Queue.h"
+#include "ace/Future.h"
+#include "ace/Hash_Map_Manager.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
diff --git a/ace/LOCK_SOCK_Acceptor.cpp b/ace/LOCK_SOCK_Acceptor.cpp
index ff208366cae..931216750ae 100644
--- a/ace/LOCK_SOCK_Acceptor.cpp
+++ b/ace/LOCK_SOCK_Acceptor.cpp
@@ -3,8 +3,8 @@
#ifndef ACE_LOCK_SOCK_ACCEPTOR_CPP
#define ACE_LOCK_SOCK_ACCEPTOR_CPP
-#include /**/ "ace/Synch.h"
-#include /**/ "ace/LOCK_SOCK_Acceptor.h"
+#include "ace/Synch.h"
+#include "ace/LOCK_SOCK_Acceptor.h"
ACE_RCSID(ace, LOCK_SOCK_Acceptor, "$Id$")
diff --git a/ace/config-pharlap.h b/ace/config-pharlap.h
index 7732a2a872c..d8ebe03341f 100644
--- a/ace/config-pharlap.h
+++ b/ace/config-pharlap.h
@@ -53,7 +53,7 @@
// Let the config-win32.h file do its thing
#undef ACE_CONFIG_H
-#include /**/ "ace/config-win32.h"
+#include "ace/config-win32.h"
#include /**/ <embkern.h>
#if defined (ACE_HAS_PHARLAP_RT)
# include /**/ <embtcpip.h>
diff --git a/ace/streams.h b/ace/streams.h
index 2e28e69b4f0..61008c47aec 100644
--- a/ace/streams.h
+++ b/ace/streams.h
@@ -29,7 +29,14 @@
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
+
#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)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+
#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -134,5 +141,11 @@
#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+// Do this so the #pragma warning in the MSVC headers do not
+// affect our #pragma warning settings
+#if (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER >= 1200 */
+
#include "ace/post.h"
#endif /* ACE_STREAMS_H */
View Lorry Controller Status