summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2013-12-12 16:33:33 +0000
committerSteve Huston <shuston@riverace.com>2013-12-12 16:33:33 +0000
commit80edf584a0e25df6a2440f5824354b550f89ffc4 (patch)
treef4c77e6c79393bf745d837dbf86ff99e151fb8f2
parent161cc32c7f5ba8f38ce62a31fc90c81add328382 (diff)
downloadATCD-80edf584a0e25df6a2440f5824354b550f89ffc4.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 4afb4ec79d4..9748b08b5e8 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 62e79af1b23..144dc3aba24 100644
--- a/ace/ATM_Stream.cpp
+++ b/ace/ATM_Stream.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (ace, ATM_Stream, "$Id$")
#if defined (ACE_HAS_ATM)
+#include "ace/OS_NS_string.h"
+
#if !defined (__ACE_INLINE__)
#include "ace/ATM_Stream.inl"
#endif /* __ACE_INLINE__ */