summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/ace/config-lynxos.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b4a8c122569..1ab2606666b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 29 07:56:54 UTC 2011 Martin Corino <mcorino@remedy.nl>
+
+ * ace/config-lynxos.h:
+ Added ACE_LACKS_STD_WSTRING to remedy compile problems with new
+ CDR stream ops in TAO.
+
Thu Jun 23 14:51:19 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/CE_Screen_Output.h:
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index ff8a10bb67a..957a5cf236b 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -108,6 +108,7 @@
#define ACE_LACKS_SUSECONDS_T
#define ACE_LACKS_TIMESPEC_T
#define ACE_LACKS_UCONTEXT_H
+#define ACE_LACKS_STD_WSTRING
#define ACE_DEFAULT_BASE_ADDR ((char *) 0)
#define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS