summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-06-26 15:58:17 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-06-26 15:58:17 +0000
commita9971f5f00b0f51f63fab0a0fd0a8425b64a600c (patch)
tree93b7bffb2d442c8755a9d3ef1920662efec797f0
parent29fb029e5f4479a0c60e2906ece1691e1236bcb2 (diff)
downloadATCD-a9971f5f00b0f51f63fab0a0fd0a8425b64a600c.tar.gz
ChangeLogTag:Fri Jun 26 10:51:07 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--ChangeLog-98b15
-rw-r--r--ace/OS.h4
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index 0a4eaa19658..024cc5d2a09 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,7 +1,14 @@
+Fri Jun 26 10:51:07 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * ace/OS.h:
+ Fixed problem in ACE_DES_* macros, some preprocessors were
+ tokenizing ::~CLASS as ":: ~CLASS" and we wanted ":: ~ CLASS"
+ (were class in a macro argument).
+
Fri Jun 26 09:45:00 1998 Michael Kircher <mk1@cs.wustl.edu>
- * tests/{tests.dsw, Makefile}: Added the Upgradable RW lock test to the
- workspace.
+ * tests/{tests.dsw, Makefile}: Added the Upgradable RW lock test
+ to the workspace.
Fri Jun 26 09:48:55 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
@@ -12,8 +19,8 @@ Fri Jun 26 10:43:02 EET DST 1998 Wei Chiang <wei.chiang@ntc.nokia.com>
* ace/CLASSIX/CLASSIX_OS.cpp:
ACE_CLASSIX_OS::ACE_CLASSIX_OS()
- After created an CLASSIX reactor as an actor-wide sinleton reactor,
- delete the original reator singleton, if any.
+ After created an CLASSIX reactor as an actor-wide singleton
+ reactor, delete the original reator singleton, if any.
Fri Jun 26 02:18:05 1998 Nanbor Wang <nanbor@cs.wustl.edu>
diff --git a/ace/OS.h b/ace/OS.h
index ddce179bd25..ade45bba147 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -5415,9 +5415,9 @@ private:
} while (0)
# define ACE_NOOP(x)
-# define ACE_DES_NOFREE (POINTER,CLASS) POINTER->CLASS::~CLASS ()
+# define ACE_DES_NOFREE (POINTER,CLASS) POINTER -> CLASS :: ~ CLASS ()
# define ACE_DES_FREE(POINTER,DEALLOCATOR,CLASS) \
- do { POINTER->CLASS::~CLASS (); DEALLOCATOR (POINTER); } while (0)
+ do { POINTER -> CLASS :: ~ CLASS (); DEALLOCATOR ( POINTER ); } while (0)
# define ACE_DES_NOFREE_TEMPLATE (POINTER,T_CLASS,T_PARAMETER) \
POINTER-> T_CLASS T_PARAMETER ::~ T_CLASS ()
# if defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L