*** empty log message ***

12 files changed, 105 insertions, 37 deletions

diff --git a/ChangeLog-98b b/ChangeLog-98b
index 4e36c260327..683ae09753d 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,20 @@
+Sat Jun 27 18:13:05 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/Timeprobe_T.cpp (ACE_Timeprobe - copy constructor): Stupid
+ 	  MSVC is forcing me to define this and make it public; it should
+ 	  really be protected; please don't use it.
+
+	* TAO/tests/POA/Explicit_Activation/server.cpp (main): 
+
+	* ace/Timeprobe.h: Added ACE_SINGLETON_DECLARATION; otherwise all
+ 	  compilation units would get a different instantiation of the
+ 	  time probe class.  Also, changed ACE_TIMEPROBE_SINGLETON to a
+ 	  #define instead of a typedef; otherwise the compiler bitched
+ 	  when it was use in ACE_SINGLETON_DECLARATION.
+
+	* SINGLETON_INSTANTIATION: Removed this flag from all files in
+ 	  ACE. It is causing duplicate declaration errors.
+
 Sat Jun 27 11:29:50 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * ACE version 4.5.18 released.
@@ -15,6 +32,67 @@ Sat Jun 27 07:07:43 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * ACE version 4.5.17 released.
 
+Sat Jun 27 00:27:29 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/Timeprobe: 
+
+	  - Added back ACE_COMPILE_TIMEPROBES.  David pointed out that
+ 	    without this flag, size of ACE increases even when time probes
+ 	    are not being used. Therefore, users must compile ACE with
+ 	    this flag defined if they want to use time probes.  This can
+ 	    be achieved by doing one of the following:
+
+	    . Use make probe = 1, if you are using the make utility.
+
+	    . Define ACE_COMPILE_TIMEPROBES in config.h
+
+	    . Define ACE_COMPILE_TIMEPROBES in the VC project file.
+
+	    . Other regular methods will also work.
+
+	    It is not necessary to define ACE_COMPILE_TIMEPROBES when
+ 	    using time probes, you simply need ACE_ENABLE_TIMEPROBES.  You
+ 	    can use the ACE_TIMEPROBE_* macros to program the time probes,
+ 	    and use the ACE_ENABLE_TIMEPROBE to enable the time probes.
+  	    If you define ACE_ENABLE_TIMEPROBE in your code, but forget to
+ 	    compile ACE with ACE_COMPILE_TIMEPROBES, you will end up with
+ 	    linker errors.
+
+	    Remember that ACE_COMPILE_TIMEPROBES means that the ACE
+ 	    library will contain code for time probes.  This is only
+ 	    useful when compiling ACE. ACE_ENABLE_TIMEPROBES means that
+ 	    the ACE_TIMEPROBE_* macros should spring to life.
+	
+	  - Added inclusion of OS.h.  This way the ACE_COMPILE_TIMEPROBES
+ 	    can be specified in the config file.
+
+	* include/makeinclude/wrapper_macros.GNU: probe = 1 no longer
+ 	  means ACE_ENABLE_TIMEPROBE.  It only means
+ 	  ACE_COMPILE_TIMEPROBES.  This was changed because defining
+ 	  ACE_ENABLE_TIMEPROBE here is too broad.  ACE_ENABLE_TIMEPROBE is
+ 	  cleverly designed so that it allows only some time probes to be
+ 	  enabled (where ACE_ENABLE_TIMEPROBE is defined), while others to
+ 	  be disabled (where ACE_ENABLE_TIMEPROBE is not defined).
+	 
+	  Example: IDL_Cubit time probes can be enabled without enabling
+ 	  TAO time probes. Or TAO time probes can be enabled without
+ 	  enabling IDL_Cubit time probes. TAO time probes are controlled
+	  through TAO/tao/Timeprobes.h.
+
+	* tests/Timeprobe_Test.cpp: 
+
+	  - Defining ACE_ENABLE_TIMEPROBES is not forced. Users can
+ 	    uncomment this at the top of the file.  This relieves us from
+ 	    trying to include the symbols of ACE_Timeprobes from ACE if
+ 	    ACE was compiled without using ACE_COMPILE_TIMEPROBES (the
+ 	    #include ace/Timeprobe.cpp trick did not work on all 8
+ 	    different ways of compiling ACE on NT).
+	    
+	  - Made the registration of the description arrays similar to the
+	    real use cases (in TAO).
+
+	  - Introduced enums and took the magic numbers out.
+
 Fri Jun 26 14:52:33 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
 
         * tests/test_config.h: Don't close the ofstream before opening the
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 0bed7a6dfc8..a30187c7b39 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,8 @@
+Sat Jun 27 18:13:05 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* TAO/tests/POA/Explicit_Activation/server.cpp (main): Changed
+ 	  #include "ace/Timeprobes.h" to #include "tao/Timeprobes.h".
+
 Sat Jun 27 11:38:27 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * TAO version 0.1.35 released.
diff --git a/TAO/TAO_IDL/GenExportH.BAT b/TAO/TAO_IDL/GenExportH.BAT
index 2c56945b0ac..966c1c5857c 100755
--- a/TAO/TAO_IDL/GenExportH.BAT
+++ b/TAO/TAO_IDL/GenExportH.BAT
@@ -23,21 +23,17 @@ Echo #  if (%1_HAS_DLL == 1)
 Echo #    if defined (%1_BUILD_DLL)
 Echo #      define %1_Export ACE_Proper_Export_Flag
 Echo #      define %1_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-Echo #      define %1_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
 Echo #    else
 Echo #      define %1_Export ACE_Proper_Import_Flag
 Echo #      define %1_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-Echo #      define %1_SINGLETON_INSTANTIATION(T)
 Echo #    endif /* %1_BUILD_DLL */
 Echo #  else 
 Echo #    define %1_Export
 Echo #    define %1_SINGLETON_DECLARATION(T)
-Echo #    define %1_SINGLETON_INSTANTIATION(T)
 Echo #  endif   /* ! %1_HAS_DLL == 1 */
 Echo #else
 Echo #  define %1_Export
 Echo #  define %1_SINGLETON_DECLARATION(T)
-Echo #  define %1_SINGLETON_INSTANTIATION(T)
 Echo #endif     /* %1_HAS_DLL */
 Echo.
 Echo #endif     /* %1_EXPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
index 9c2c01fce44..2ca6a91c499 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
@@ -14,21 +14,17 @@
 #    if defined (TAO_ORBSVCS_BUILD_DLL)
 #      define TAO_ORBSVCS_Export ACE_Proper_Export_Flag
 #      define TAO_ORBSVCS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define TAO_ORBSVCS_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
 #    else
 #      define TAO_ORBSVCS_Export ACE_Proper_Import_Flag
 #      define TAO_ORBSVCS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define TAO_ORBSVCS_SINGLETON_INSTANTIATION(T)
 #    endif /* TAO_ORBSVCS_BUILD_DLL */
 #  else 
 #    define TAO_ORBSVCS_Export
 #    define TAO_ORBSVCS_SINGLETON_DECLARATION(T)
-#    define TAO_ORBSVCS_SINGLETON_INSTANTIATION(T)
 #  endif   /* ! TAO_ORBSVCS_HAS_DLL == 1 */
 #else
 #  define TAO_ORBSVCS_Export
 #  define TAO_ORBSVCS_SINGLETON_DECLARATION(T)
-#  define TAO_ORBSVCS_SINGLETON_INSTANTIATION(T)
 #endif     /* TAO_ORBSVCS_HAS_DLL */
 
 #endif     /* TAO_ORBSVCS_EXPORT_H */
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 03f5ea96c3c..08eef384b5b 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -61,16 +61,13 @@
 #  if defined (TAO_BUILD_DLL)
 #    define TAO_Export ACE_Proper_Export_Flag
 #    define TAO_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
 #  else
 #    define TAO_Export ACE_Proper_Import_Flag
 #    define TAO_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SINGLETON_INSTANTIATION(T)
 #  endif /* TAO_BUILD_DLL */
 #else /* TAO_HAS_DLL */
 #  define TAO_Export
 #  define TAO_SINGLETON_DECLARATION(T)
-#  define TAO_SINGLETON_INSTANTIATION(T)
 #endif /* TAO_HAS_DLL */
 
 // COM stuff
diff --git a/TAO/tests/POA/Explicit_Activation/server.cpp b/TAO/tests/POA/Explicit_Activation/server.cpp
index 7ad5462a00f..f92ca32ddcc 100644
--- a/TAO/tests/POA/Explicit_Activation/server.cpp
+++ b/TAO/tests/POA/Explicit_Activation/server.cpp
@@ -21,7 +21,7 @@
 // ================================================================
 
 #include "ace/streams.h"
-#include "ace/Timeprobe.h"
+#include "tao/Timeprobe.h"
 #include "MyFooServant.h"
 
 int
diff --git a/TAO/tests/POA/Generic_Servant/generic_servant_export.h b/TAO/tests/POA/Generic_Servant/generic_servant_export.h
index ed91c284fe1..6c7059c79a2 100644
--- a/TAO/tests/POA/Generic_Servant/generic_servant_export.h
+++ b/TAO/tests/POA/Generic_Servant/generic_servant_export.h
@@ -14,21 +14,17 @@
 #    if defined (GENERIC_SERVANT_BUILD_DLL)
 #      define GENERIC_SERVANT_Export ACE_Proper_Export_Flag
 #      define GENERIC_SERVANT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
 #    else
 #      define GENERIC_SERVANT_Export ACE_Proper_Import_Flag
 #      define GENERIC_SERVANT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
 #    endif /* GENERIC_SERVANT_BUILD_DLL */
 #  else
 #    define GENERIC_SERVANT_Export
 #    define GENERIC_SERVANT_SINGLETON_DECLARATION(T)
-#    define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
 #  endif   /* ! GENERIC_SERVANT_HAS_DLL == 1 */
 #else
 #  define GENERIC_SERVANT_Export
 #  define GENERIC_SERVANT_SINGLETON_DECLARATION(T)
-#  define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
 #endif     /* GENERIC_SERVANT_HAS_DLL */
 
 #endif     /* GENERIC_SERVANT_EXPORT_H */
diff --git a/ace/OS.h b/ace/OS.h
index 92b092b8101..188b7a46df1 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -372,7 +372,6 @@
 #     define ACE_Proper_Import_Flag __declspec (dllimport)
 #     define ACE_EXPORT_SINGLETON_DECLARATION(T)  template class __declspec (dllexport) T
 #     define ACE_IMPORT_SINGLETON_DECLARATION(T)  extern template class T
-#     define ACE_PROPER_SINGLETON_INSTANTIATION(T) template class T
 #   else /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
 /* Non-Microsoft, other versions of Borland: */
 #     define ACE_Proper_Export_Flag _export
@@ -380,14 +379,12 @@
 //   @@ Don't know how to handle this when using Borland's compilers.
 #     define ACE_EXPORT_SINGLETON_DECLARATION(T)
 #     define ACE_IMPORT_SINGLETON_DECLARATION(T)
-#     define ACE_PROPER_SINGLETON_INSTANTIATION(T)
 #   endif /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
 # else  /* ! ACE_WIN32 */
 #   define ACE_Proper_Export_Flag
 #   define ACE_Proper_Import_Flag
 #   define ACE_EXPORT_SINGLETON_DECLARATION(T)
 #   define ACE_IMPORT_SINGLETON_DECLARATION(T)
-#   define ACE_PROPER_SINGLETON_INSTANTIATION(T)
 # endif /* ACE_WIN32 */
 
 // Here are definition for ACE library.
@@ -395,16 +392,13 @@
 #   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_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
 #   else
 #     define ACE_Export ACE_Proper_Import_Flag
 #     define ACE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#     define ACE_SINGLETON_INSTANTIATION(T)
 #   endif /* ACE_BUILD_DLL */
 # else /* ! ACE_HAS_DLL */
 #   define ACE_Export
 #   define ACE_SINGLETON_DECLARATION(T)
-#   define ACE_SINGLETON_INSTANTIATION(T)
 # endif /* ACE_HAS_DLL */
 
 // Here are definition for ACE_Svc library.
@@ -412,16 +406,13 @@
 #   if defined (ACE_BUILD_SVC_DLL)
 #     define ACE_Svc_Export ACE_Proper_Export_Flag
 #     define ACE_SVC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#     define ACE_SVC_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
 #   else
 #     define ACE_Svc_Export ACE_Proper_Import_Flag
 #     define ACE_SVC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#     define ACE_SVC_SINGLETON_INSTANTIATION(T)
 #   endif /* ACE_BUILD_SVC_DLL */
 # else /* ACE_HAS_SVC_DLL */
 #   define ACE_Svc_Export
 #   define ACE_SVC_SINGLETON_DECLARATION(T)
-#   define ACE_SVC_SINGLETON_INSTANTIATION(T)
 # endif /* ACE_HAS_SVC_DLL */
 
 // This is a whim of mine -- that instead of annotating a class with
diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h
index b79ea26682f..d910f9f251c 100644
--- a/ace/Timeprobe.h
+++ b/ace/Timeprobe.h
@@ -85,13 +85,15 @@ typedef ACE_Timeprobe<ACE_TIMEPROBE_MUTEX>
 // their own instance of ACE_Timerprobe, without interfering with each
 // other.
 #  if defined (ACE_TSS_TIMEPROBES)
-typedef ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX> 
-        ACE_TIMEPROBE_SINGLETON;
+#define ACE_TIMEPROBE_SINGLETON \
+        ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>; 
 #  else /* ACE_TSS_TIMEPROBES */
-typedef ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX> 
-        ACE_TIMEPROBE_SINGLETON;
+#define ACE_TIMEPROBE_SINGLETON \
+        ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>;
 #  endif /* ACE_TSS_TIMEPROBES */
 
+ACE_SINGLETON_DECLARATION (ACE_TIMEPROBE_SINGLETON);
+
 #endif /* ACE_COMPILE_TIMEPROBES */
 
 // If ACE_ENABLE_TIMEPROBES is defined, the macros below will
diff --git a/ace/Timeprobe_T.cpp b/ace/Timeprobe_T.cpp
index 7b37918e7a6..822e32a26a4 100644
--- a/ace/Timeprobe_T.cpp
+++ b/ace/Timeprobe_T.cpp
@@ -29,6 +29,18 @@ ACE_Timeprobe<ACE_LOCK>::ACE_Timeprobe (u_long size)
 }
 
 template <class ACE_LOCK>
+ACE_Timeprobe<ACE_LOCK>::ACE_Timeprobe (const ACE_Timeprobe<ACE_LOCK> &)
+{
+  //
+  // Stupid MSVC is forcing me to define this; please don't use it.
+  //
+
+  ACE_ERROR ((LM_ERROR, 
+              __TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__)); 
+  errno = ENOTSUP;   
+}
+
+template <class ACE_LOCK>
 ACE_Timeprobe<ACE_LOCK>::~ACE_Timeprobe (void)
 {
   delete [] this->timeprobes_;
diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h
index c5e502dfeea..66852fe3f92 100644
--- a/ace/Timeprobe_T.h
+++ b/ace/Timeprobe_T.h
@@ -74,6 +74,9 @@ public:
   void reset (void);
   // Reset the slots.  All old time probes will be lost.
 
+  ACE_Timeprobe (const ACE_Timeprobe<ACE_LOCK> &);
+  // Not implemented (stupid MSVC won't let it be protected).
+
 protected:
   typedef ACE_Timeprobe<ACE_LOCK> 
           SELF;
@@ -93,9 +96,6 @@ protected:
   // Added sections below here to make compatible with the VMETRO
   // board test.
 
-  ACE_Timeprobe (const ACE_Timeprobe<ACE_LOCK> &);
-  // Not implemented.
-
   const char *find_description_i (u_long i);
   // Find description of event <i>
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Export.h b/apps/JAWS/PROTOTYPE/JAWS/Export.h
index 4bfc7ddf761..b6be46cac93 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Export.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Export.h
@@ -15,23 +15,18 @@
 #      define JAWS_Export ACE_Proper_Export_Flag
 #      define JAWS_SINGLETON_DECLARATION(T) \
               ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define JAWS_SINGLETON_INSTANTIATION(T) \
-              ACE_PROPER_SINGLETON_INSTANTIATION (T)
 #    else
 #      define JAWS_Export ACE_Proper_Import_Flag
 #      define JAWS_SINGLETON_DECLARATION(T) \
               ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define JAWS_SINGLETON_INSTANTIATION(T)
 #    endif /* JAWS_BUILD_DLL */
 #  else
 #    define JAWS_Export
 #    define JAWS_SINGLETON_DECLARATION(T)
-#    define JAWS_SINGLETON_INSTANTIATION(T)
 #  endif   /* ! JAWS_HAS_DLL == 1 */
 #else
 #  define JAWS_Export
 #  define JAWS_SINGLETON_DECLARATION(T)
-#  define JAWS_SINGLETON_INSTANTIATION(T)
 #endif     /* JAWS_HAS_DLL */
 
 #endif     /* JAWS_EXPORT_H */