summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-04 21:31:56 +0000
committercrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-04 21:31:56 +0000
commita3a12060ebae2e37d469d43811958c3b2f034ff5 (patch)
treeb661fd08a9d166c5a4c588c0e078258348edef7a
parent395b0e1edac056bfbd574e6b64d47fe144c35275 (diff)
downloadATCD-a3a12060ebae2e37d469d43811958c3b2f034ff5.tar.gz
ChangeLogTag: Mon Feb 4 16:22:20 2002 Craig Rodrigues <crodrigu@bbn.com>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-02a5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--ace/OS.h6
4 files changed, 20 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b32575c520a..a19ee812e78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 4 16:22:20 2002 Craig Rodrigues <crodrigu@bbn.com>
+
+ * ace/OS.h: Include <new> instead of <new.h> if
+ ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB is defined.
+
Mon Feb 4 19:58:03 2002 Boris Kolpackov <bosk@ipmce.ru>
* ace/Log_Msg.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index b32575c520a..a19ee812e78 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Mon Feb 4 16:22:20 2002 Craig Rodrigues <crodrigu@bbn.com>
+
+ * ace/OS.h: Include <new> instead of <new.h> if
+ ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB is defined.
+
Mon Feb 4 19:58:03 2002 Boris Kolpackov <bosk@ipmce.ru>
* ace/Log_Msg.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b32575c520a..a19ee812e78 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Mon Feb 4 16:22:20 2002 Craig Rodrigues <crodrigu@bbn.com>
+
+ * ace/OS.h: Include <new> instead of <new.h> if
+ ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB is defined.
+
Mon Feb 4 19:58:03 2002 Boris Kolpackov <bosk@ipmce.ru>
* ace/Log_Msg.cpp:
diff --git a/ace/OS.h b/ace/OS.h
index 119e9a90bf0..f545a3c64f5 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -2582,7 +2582,11 @@ typedef unsigned int size_t;
#endif
# if !defined (ACE_LACKS_NEW_H)
-# include /**/ <new.h>
+# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+# include /**/ <new>
+# else
+# include /**/ <new.h>
+# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
# endif /* ! ACE_LACKS_NEW_H */
# if !defined (ACE_PSOS_DIAB_MIPS) && !defined (VXWORKS)