summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2002-03-04 06:39:30 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2002-03-04 06:39:30 +0000
commit04b14f70dbb0cd1d2e1566943054fdb228b0f5a5 (patch)
tree8dd6bfb226c9f024c13e13ef739ade74a8044ca1
parent4389cf48fde1d75a1df9eb3cf04a55acefd5d746 (diff)
downloadATCD-04b14f70dbb0cd1d2e1566943054fdb228b0f5a5.tar.gz
ChangeLogTag: Mon Mar 04 07:33:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-02a5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--tests/Token_Strategy_Test.cpp8
4 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b3783b742b7..6af42088b70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 4 07:36:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Token_Strategy_Test.cpp:
+ Fixed MSVC6 unicode build errors.
+
Sun Mar 3 15:56:23 2002 Craig Rodrigues <crodrigu@bbn.com>
* tests/Token_Strategy_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index b3783b742b7..6af42088b70 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Mon Mar 4 07:36:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Token_Strategy_Test.cpp:
+ Fixed MSVC6 unicode build errors.
+
Sun Mar 3 15:56:23 2002 Craig Rodrigues <crodrigu@bbn.com>
* tests/Token_Strategy_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b3783b742b7..6af42088b70 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Mon Mar 4 07:36:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Token_Strategy_Test.cpp:
+ Fixed MSVC6 unicode build errors.
+
Sun Mar 3 15:56:23 2002 Craig Rodrigues <crodrigu@bbn.com>
* tests/Token_Strategy_Test.cpp:
diff --git a/tests/Token_Strategy_Test.cpp b/tests/Token_Strategy_Test.cpp
index ddb3817a888..8b1cde45406 100644
--- a/tests/Token_Strategy_Test.cpp
+++ b/tests/Token_Strategy_Test.cpp
@@ -95,10 +95,10 @@ Token_Strategy_Test::Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy,
this->token_.queueing_strategy (this->strategy_);
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT (" (tid = %t) Token_Test::Token_Test (\n"
+ ACE_TEXT (" (tid = %t) Token_Test::Token_Test (\n")
ACE_TEXT (" token_type = %s\n")
ACE_TEXT (" thread = %d\n")
- ACE_TEXT (" invocations = %d\n")),
+ ACE_TEXT (" invocations = %d\n"),
this->strategy_ == ACE_Token::FIFO ? ACE_TEXT ("FIFO") : ACE_TEXT ("LIFO"),
this->threads_,
this->invocations_));
@@ -137,8 +137,8 @@ Token_Strategy_Test::svc (void)
// Turn this on to watch each thread grab the token. LIFO has the interesting
// behavior that two thread seem to take turns while all the other threads wait.
if (0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (tid = %t) token count = %d, "
- ACE_TEXT ("waiters = %d, loop: %d/%d\n")),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (tid = %t) token count = %d, ")
+ ACE_TEXT ("waiters = %d, loop: %d/%d\n"),
this->counter_.value (),
this->token_.waiters (), i + 1,
this->invocations_));