summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog-96b5
-rw-r--r--ace/OS.h6
-rw-r--r--tests/UNIXtokens.conf2
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog-96b b/ChangeLog-96b
index dfcb52af981..c5c633de3d1 100644
--- a/ChangeLog-96b
+++ b/ChangeLog-96b
@@ -1,3 +1,8 @@
+Mon Dec 30 15:24:59 1996 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu>
+
+ * ace/OS.h: Added a special case for ACE_UNUSED_ARG that works
+ with G++. Thanks to David Levine for this.
+
Mon Dec 30 16:05:11 1996 David L. Levine <levine@cs.wustl.edu>
* ace/OS.cpp (ace_thread_adapter): Updated ACE_TRACE arg
diff --git a/ace/OS.h b/ace/OS.h
index 393793e3a38..8b5c5342be5 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -153,6 +153,12 @@
// GreenHills C++ 1.8.8 complains that the (a) expression has no effect. But,
// it doesn't complain about unused args, so don't bother with them.
#define ACE_UNUSED_ARG(a)
+#elif defined (__GNUC__)
+// gcc 2.7.2 complains about unused args with -Wall, and complains
+// about "statement with no effect" with (a). This eliminates the
+// warnings, and no code is generated for the null conditional
+// statement.
+#define ACE_UNUSED_ARG(a) {if (&a) /* null */ ;}
#else
#define ACE_UNUSED_ARG(a) (a)
#endif /* ghs */
diff --git a/tests/UNIXtokens.conf b/tests/UNIXtokens.conf
index 901970c306d..4be60c0df13 100644
--- a/tests/UNIXtokens.conf
+++ b/tests/UNIXtokens.conf
@@ -1,6 +1,6 @@
# Solaris version
#
-dynamic Logging_Strategy Service_Object * ../netsvcs/lib/libnet_svcs.so:_make_ACE_Logging_Strategy() "-s log/Tokens_Test_Server.log -f OSTREAM"
+dynamic Logging_Strategy Service_Object * ../netsvcs/lib/libnet_svcs:_make_ACE_Logging_Strategy() "-s log/Tokens_Test_Server.log -f OSTREAM"
dynamic Token_Service Service_Object * ../netsvcs/lib/libnet_svcs:_make_ACE_Token_Acceptor() "-p 23456"