summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2013-06-06 12:39:47 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2013-06-06 12:39:47 +0000
commite2f946ee2440a0669b4d72b6ff91b7867db7e063 (patch)
tree43d57e39e987bf9245a18edcc3bee6263f2c899d
parenta5c50f0b89fd20684207de249b148cb865629562 (diff)
downloadATCD-e2f946ee2440a0669b4d72b6ff91b7867db7e063.tar.gz
Thu Jun 6 12:38:36 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* performance-tests/Cubit/TAO/MT_Cubit/server.cpp: Another wchar build fix.
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c28c4b64bb0..8ca83d98481 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 6 12:38:36 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
+
+ Another wchar build fix.
+
Thu Jun 6 12:10:48 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/Trader/Offer_Database.cpp:
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index cbd698f6a6e..d413a5becac 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -181,7 +181,7 @@ Server::activate_high_servant (void)
{ orbendpoint,
const_cast<ACE_TCHAR *> (ACE_TEXT ("-ORBSndSock 32768 ")),
const_cast<ACE_TCHAR *> (ACE_TEXT ("-ORBRcvSock 32768 ")),
- ACE_TEXT (0)
+ 0
};
ACE_NEW_RETURN (this->high_argv_,
ACE_ARGV (this->argv_, high_second_argv),