summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--performance-tests/Misc/test_naming.cpp16
4 files changed, 26 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cd78c44e2b..198f7e70af9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 06 00:06:52 2001 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * performance-tests/Misc/test_naming.cpp: Replaced the use of
+ ACE_WString with ACE_NS_WString as ACE_WString no longer support
+ initization using char string.
+
Wed Dec 05 17:13:15 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/SString.h: The concatenation oeprator needed to be
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 3cd78c44e2b..198f7e70af9 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Thu Dec 06 00:06:52 2001 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * performance-tests/Misc/test_naming.cpp: Replaced the use of
+ ACE_WString with ACE_NS_WString as ACE_WString no longer support
+ initization using char string.
+
Wed Dec 05 17:13:15 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/SString.h: The concatenation oeprator needed to be
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 3cd78c44e2b..198f7e70af9 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Thu Dec 06 00:06:52 2001 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * performance-tests/Misc/test_naming.cpp: Replaced the use of
+ ACE_WString with ACE_NS_WString as ACE_WString no longer support
+ initization using char string.
+
Wed Dec 05 17:13:15 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/SString.h: The concatenation oeprator needed to be
diff --git a/performance-tests/Misc/test_naming.cpp b/performance-tests/Misc/test_naming.cpp
index 6d9ee59d6d1..def6a73f985 100644
--- a/performance-tests/Misc/test_naming.cpp
+++ b/performance-tests/Misc/test_naming.cpp
@@ -40,10 +40,10 @@ bind (ACE_Naming_Context *ns_context, int result)
if (i % 50 == 0)
ACE_DEBUG ((LM_DEBUG, "."));
ACE_OS::sprintf (name, "%s%d", "name", i);
- ACE_WString w_name (name);
+ ACE_NS_WString w_name (name);
ACE_OS::sprintf (value, "%s%d", "value", i);
- ACE_WString w_value (value);
+ ACE_NS_WString w_value (value);
ACE_OS::sprintf (type, "%s%d", "type", i);
if (ns_context->bind (w_name, w_value, type) != result) {
@@ -60,9 +60,9 @@ rebind (ACE_Naming_Context *ns_context, int result)
for (int i = 1; i <= ACE_NS_MAX_ENTRIES; i++)
{
ACE_OS::sprintf (name, "%s%d", "name", i);
- ACE_WString w_name (name);
+ ACE_NS_WString w_name (name);
ACE_OS::sprintf (value, "%s%d", "value", -i);
- ACE_WString w_value (value);
+ ACE_NS_WString w_value (value);
ACE_OS::sprintf (type, "%s%d", "type", -i);
if (ns_context->rebind (w_name, w_value, type) != result) {
ACE_ERROR ((LM_ERROR, "rebind failed!"));
@@ -77,7 +77,7 @@ unbind (ACE_Naming_Context *ns_context, int result)
for (int i = 1; i <= ACE_NS_MAX_ENTRIES; i++)
{
ACE_OS::sprintf (name, "%s%d", "name", i);
- ACE_WString w_name (name);
+ ACE_NS_WString w_name (name);
if (ns_context->unbind (w_name) != result) {
ACE_ERROR ((LM_ERROR, "unbind failed!"));
}
@@ -94,9 +94,9 @@ find (ACE_Naming_Context *ns_context, int sign, int result)
for (int i = 1; i <= ACE_NS_MAX_ENTRIES; i++)
{
ACE_OS::sprintf (name, "%s%d", "name", i);
- ACE_WString w_name (name);
+ ACE_NS_WString w_name (name);
- ACE_WString w_value;
+ ACE_NS_WString w_value;
char *type_out;
if (sign == 1)
@@ -110,7 +110,7 @@ find (ACE_Naming_Context *ns_context, int sign, int result)
ACE_OS::sprintf (temp_type, "%s%d", "type", -i);
}
- ACE_WString val (temp_val);
+ ACE_NS_WString val (temp_val);
int resolve_result = ns_context->resolve (w_name, w_value, type_out);
if (resolve_result != result) {