summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2013-12-12 16:31:33 +0000
committerSteve Huston <shuston@riverace.com>2013-12-12 16:31:33 +0000
commitbd6c9f180fb7dd8edbca17cc450ddb092b093178 (patch)
tree2a4c477a4c038c43b9cab1900f3d0ffc26463787
parent4e9aeae07a291cd6aaaa1a11f362d32953a67997 (diff)
downloadATCD-bd6c9f180fb7dd8edbca17cc450ddb092b093178.tar.gz
ChangeLogTag:Thu Dec 12 16:28:45 UTC 2013 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/ChangeLog4
-rw-r--r--ACE/ace/ATM_Stream.cpp2
2 files changed, 6 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 924ee0f7d22..ab84b365f69 100644
--- a/ACE/ChangeLog
+++ b/ACE/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
+
Fri Sep 27 21:33:58 UTC 2013 Steve Huston <shuston@riverace.com>
* ace/ACE.cpp: Same fix as Thu Sep 26 20:22:53 made to recvv_n_i(),
diff --git a/ACE/ace/ATM_Stream.cpp b/ACE/ace/ATM_Stream.cpp
index b68156e3682..492537a530d 100644
--- a/ACE/ace/ATM_Stream.cpp
+++ b/ACE/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__ */