summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2001-02-18 23:18:05 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2001-02-18 23:18:05 +0000
commiteac93696c139c7dcd25e025dc0aea563b18e5601 (patch)
treea27ff1cc97b04ce40d616964d1987320bc1ebd84
parent87a70f6ede2b410d7f251a9a6fa91c516f2ebb46 (diff)
downloadATCD-eac93696c139c7dcd25e025dc0aea563b18e5601.tar.gz
ChangeLogTag:Sun Feb 18 17:16:41 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--tests/Tokens_Test.cpp4
4 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e024e4fb0b..0c899b60e1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 18 17:16:41 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
+
+ * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the
+ ACE_HAS_TOKENS_LIBRARY stuff. Thanks to Kitty for reporting
+ this.
+
Sun Feb 18 16:28:45 2001 Chris Gill <cdgill@cs.wustl.edu>
* ace/RB_Tree.h: Changed order of method declarations to (hopefully)
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 6e024e4fb0b..0c899b60e1f 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Sun Feb 18 17:16:41 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
+
+ * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the
+ ACE_HAS_TOKENS_LIBRARY stuff. Thanks to Kitty for reporting
+ this.
+
Sun Feb 18 16:28:45 2001 Chris Gill <cdgill@cs.wustl.edu>
* ace/RB_Tree.h: Changed order of method declarations to (hopefully)
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 6e024e4fb0b..0c899b60e1f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Sun Feb 18 17:16:41 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
+
+ * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the
+ ACE_HAS_TOKENS_LIBRARY stuff. Thanks to Kitty for reporting
+ this.
+
Sun Feb 18 16:28:45 2001 Chris Gill <cdgill@cs.wustl.edu>
* ace/RB_Tree.h: Changed order of method declarations to (hopefully)
diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp
index 94cd5ff2656..30826825859 100644
--- a/tests/Tokens_Test.cpp
+++ b/tests/Tokens_Test.cpp
@@ -205,6 +205,7 @@ main (int, ACE_TCHAR *[])
{
ACE_START_TEST (ACE_TEXT ("Tokens_Test"));
#if defined (ACE_HAS_THREADS)
+#if defined (ACE_HAS_TOKENS_LIBRARY)
ACE_Token_Proxy *A = 0, *B = 0, *R = 0, *W = 0;
ACE_NEW_RETURN (A,
@@ -301,9 +302,10 @@ main (int, ACE_TCHAR *[])
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%t) main thread exiting.\n")));
-#elif defined (ACE_HAS_TOKENS_LIBRARY)
+#else
ACE_ERROR ((LM_INFO,
ACE_TEXT ("ACE must be compiled with -DACE_HAS_TOKENS_LIBRARY to run this test\n")));
+#endif /* ACE_HAS_TOKENS_LIBRARY */
#else
ACE_ERROR ((LM_INFO,
ACE_TEXT ("threads not supported on this platform\n")));