summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2013-12-12 16:32:49 +0000
committerSteve Huston <shuston@riverace.com>2013-12-12 16:32:49 +0000
commita1f9f01117f42ee08b9c20200d019da617ca8c61 (patch)
tree71fd268e751d6cc1dc86664607c3c8c45d7e24a8
parentd3213fa3267c292330a18e3b3110665d4d43f954 (diff)
downloadATCD-a1f9f01117f42ee08b9c20200d019da617ca8c61.tar.gz
ChangeLogTag:Thu Dec 12 16:28:45 UTC 2013 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog4
-rw-r--r--ace/ATM_Stream.cpp2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5cae7338fd3..79a4a962b89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 12 16:28:45 UTC 2013 Steve Huston <shuston@riverace.com>
+
+ * ace/ATM_Stream.cpp: Add missing OS_NS_string.h
+
Thu Sep 26 20:22:53 UTC 2013 Steve Huston <shuston@riverace.com>
* ace/ACE.cpp (recvv_n_i): Resolve 64-bit compile warning on Windows.
diff --git a/ace/ATM_Stream.cpp b/ace/ATM_Stream.cpp
index 14c07bc03bf..9a281f6f704 100644
--- a/ace/ATM_Stream.cpp
+++ b/ace/ATM_Stream.cpp
@@ -4,6 +4,8 @@
#if defined (ACE_HAS_ATM)
+#include "ace/OS_NS_string.h"
+
#if !defined (__ACE_INLINE__)
#include "ace/ATM_Stream.inl"
#endif /* __ACE_INLINE__ */