ChangeLogTag: Tue Sep 12 15:15:54 2000 Irfan Pyarali <irfan@cs.wustl.edu>

5 files changed, 54 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index a9c98626cb8..1b151ef6a8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Sep 12 15:15:54 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/ACE_export.h (ACE_SINGLETON_DECLARATION): Added the new
+	  SINGLETON_DECLARE macros.
+
+	* ace/Timeprobe.h: Used the new macro ACE_SINGLETON_DECLARE
+	  instead of ACE_SINGLETON_DECLARATION.  This helps by not
+	  requiring the comma which makes the precompiler think that the
+	  comma is for an extra argument to the macro.  
+
+	  Thanks to Phil Mesnier <mesnier_p@ociweb.com> for reporting this
+	  problem.
+	
 Tue Sep 12 11:34:03 2000  Steve Huston  <shuston@riverace.com>
 
         * ace/High_Res_Timer.{h i}: Added a new function, gettimeofday_hr()
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a9c98626cb8..1b151ef6a8e 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Tue Sep 12 15:15:54 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/ACE_export.h (ACE_SINGLETON_DECLARATION): Added the new
+	  SINGLETON_DECLARE macros.
+
+	* ace/Timeprobe.h: Used the new macro ACE_SINGLETON_DECLARE
+	  instead of ACE_SINGLETON_DECLARATION.  This helps by not
+	  requiring the comma which makes the precompiler think that the
+	  comma is for an extra argument to the macro.  
+
+	  Thanks to Phil Mesnier <mesnier_p@ociweb.com> for reporting this
+	  problem.
+	
 Tue Sep 12 11:34:03 2000  Steve Huston  <shuston@riverace.com>
 
         * ace/High_Res_Timer.{h i}: Added a new function, gettimeofday_hr()
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a9c98626cb8..1b151ef6a8e 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Tue Sep 12 15:15:54 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/ACE_export.h (ACE_SINGLETON_DECLARATION): Added the new
+	  SINGLETON_DECLARE macros.
+
+	* ace/Timeprobe.h: Used the new macro ACE_SINGLETON_DECLARE
+	  instead of ACE_SINGLETON_DECLARATION.  This helps by not
+	  requiring the comma which makes the precompiler think that the
+	  comma is for an extra argument to the macro.  
+
+	  Thanks to Phil Mesnier <mesnier_p@ociweb.com> for reporting this
+	  problem.
+	
 Tue Sep 12 11:34:03 2000  Steve Huston  <shuston@riverace.com>
 
         * ace/High_Res_Timer.{h i}: Added a new function, gettimeofday_hr()
diff --git a/ace/ACE_export.h b/ace/ACE_export.h
index 8a6bf6b8877..e9c388c793f 100644
--- a/ace/ACE_export.h
+++ b/ace/ACE_export.h
@@ -4,7 +4,7 @@
 // This file is generated automatically by
 // generate_export_file.pl
 // ------------------------------
-#if !defined (ACE_EXPORT_H)
+#ifndef ACE_EXPORT_H
 #define ACE_EXPORT_H
 
 #include "ace/config-all.h"
@@ -18,17 +18,21 @@
 #    if defined (ACE_BUILD_DLL)
 #      define ACE_Export ACE_Proper_Export_Flag
 #      define ACE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#      define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #    else
 #      define ACE_Export ACE_Proper_Import_Flag
 #      define ACE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#      define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #    endif /* ACE_BUILD_DLL */
 #  else
 #    define ACE_Export
 #    define ACE_SINGLETON_DECLARATION(T)
+#    define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif   /* ! ACE_HAS_DLL == 1 */
 #else
 #  define ACE_Export
 #  define ACE_SINGLETON_DECLARATION(T)
+#  define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #endif     /* ACE_HAS_DLL */
 
 #endif     /* ACE_EXPORT_H */
diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h
index 5070a863a14..92caac950cc 100644
--- a/ace/Timeprobe.h
+++ b/ace/Timeprobe.h
@@ -131,15 +131,11 @@ typedef ACE_Timeprobe<ACE_TIMEPROBE_MUTEX>
 // their own instance of ACE_Timerprobe, without interfering with each
 // other.
 #  if defined (ACE_TSS_TIMEPROBES)
-#define ACE_TIMEPROBE_SINGLETON_DEFINE \
-        ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>;
-typedef ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>
-        ACE_TIMEPROBE_SINGLETON;
+#    define ACE_TIMEPROBE_SINGLETON_TYPE ACE_TSS_Singleton
+#    define ACE_TIMEPROBE_SINGLETON_LOCK_TYPE ACE_SYNCH_NULL_MUTEX
 #  else /* ACE_TSS_TIMEPROBES */
-#define ACE_TIMEPROBE_SINGLETON_DEFINE \
-        ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>;
-typedef ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>
-        ACE_TIMEPROBE_SINGLETON;
+#    define ACE_TIMEPROBE_SINGLETON_TYPE ACE_Singleton
+#    define ACE_TIMEPROBE_SINGLETON_LOCK_TYPE ACE_SYNCH_MUTEX
 #  endif /* ACE_TSS_TIMEPROBES */
 
 #if defined (_MSC_VER)
@@ -147,7 +143,12 @@ typedef ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>
 #pragma warning(disable:4231)
 #endif /* _MSC_VER */
 
-ACE_SINGLETON_DECLARATION (ACE_TIMEPROBE_SINGLETON_DEFINE);
+typedef ACE_TIMEPROBE_SINGLETON_TYPE<ACE_TIMEPROBE_WITH_LOCKING, ACE_TIMEPROBE_SINGLETON_LOCK_TYPE>
+        ACE_TIMEPROBE_SINGLETON;
+
+ACE_SINGLETON_DECLARE (ACE_TIMEPROBE_SINGLETON_TYPE, \
+                       ACE_TIMEPROBE_WITH_LOCKING, \
+                       ACE_TIMEPROBE_SINGLETON_LOCK_TYPE);
 
 #if defined (_MSC_VER)
 // Default back the warning of using Microsoft Extension.