ChangeLogTag:Thu May 4 13:59:58 2000 Darrell Brunsch <brunsch@uci.edu>

6 files changed, 24 insertions, 3 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index b556e8e2664..7bcbd2732a6 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Thu May  4 13:59:58 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * orbsvcs/orbsvcs/AV/AV_Core.h:
+        * orbsvcs/orbsvcs/AV/AV_export.h:
+
+          Needed to create a TAO_AV_SINGLETON_DECLARE macro and use
+          it for TAO_AV_CORE since TAO_AV_SINGLETON_DECLARATION ()
+          was having too many problems with the fact that it was being
+          used with a template class with two template parameters.
+
 Thu May  4 14:57:44 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* tao/Exception.h:
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index d98400dbcd4..00176cbfe56 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -184,10 +184,9 @@ protected:
   CORBA::Boolean stop_run_;
 };
 
-#define TAO_AV_CORE_SINGLETON_DEFINE ACE_Singleton <TAO_AV_Core, ACE_Null_Mutex>
-TAO_AV_SINGLETON_DECLARATION (TAO_AV_CORE_SINGLETON_DEFINE);
+typedef ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> TAO_AV_CORE;
 
-typedef TAO_AV_CORE_SINGLETON_DEFINE TAO_AV_CORE;
+TAO_AV_SINGLETON_DECLARE ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex>;
 
 #include "ace/post.h"
 #endif /* TAO_AV_CORE_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_export.h b/TAO/orbsvcs/orbsvcs/AV/AV_export.h
index a15b935707a..c526f6ca09c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_export.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_export.h
@@ -18,17 +18,21 @@
 #    if defined (TAO_AV_BUILD_DLL)
 #      define TAO_AV_Export ACE_Proper_Export_Flag
 #      define TAO_AV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#      define TAO_AV_SINGLETON_DECLARE ACE_EXPORT_SINGLETON_DECLARE
 #    else
 #      define TAO_AV_Export ACE_Proper_Import_Flag
 #      define TAO_AV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#      define TAO_AV_SINGLETON_DECLARE ACE_IMPORT_SINGLETON_DECLARE
 #    endif /* TAO_AV_BUILD_DLL */
 #  else
 #    define TAO_AV_Export
 #    define TAO_AV_SINGLETON_DECLARATION(T)
+#    define TAO_AV_SINGLETON_DECLARE
 #  endif   /* ! TAO_AV_HAS_DLL == 1 */
 #else
 #  define TAO_AV_Export
 #  define TAO_AV_SINGLETON_DECLARATION(T)
+#  define TAO_AV_SINGLETON_DECLARE
 #endif     /* TAO_AV_HAS_DLL */
 
 #endif     /* TAO_AV_EXPORT_H */
diff --git a/ace/config-all.h b/ace/config-all.h
index 4b281526220..02c70778e1f 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -132,6 +132,8 @@
 #  define ACE_Proper_Import_Flag
 #  define ACE_EXPORT_SINGLETON_DECLARATION(T)
 #  define ACE_IMPORT_SINGLETON_DECLARATION(T)
+#  define ACE_EXPORT_SINGLETON_DECLARE
+#  define ACE_IMPORT_SINGLETON_DECLARE
 #endif /* ACE_HAS_CUSTOM_EXPORT_MACROS */
 
 #include "ace/ACE_export.h"
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index fba3c44c7f2..da36c6ab358 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -84,6 +84,8 @@
 #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_EXPORT_SINGLETON_DECLARE  template class __declspec (dllexport)
+#define ACE_IMPORT_SINGLETON_DECLARE  extern template class
 
 // Define ACE_HAS_WINSOCK2 to 0 in your config.h file if you do *not*
 // want to compile with WinSock 2.0.
diff --git a/bin/generate_export_file.pl b/bin/generate_export_file.pl
index 22bd826a4ed..74002ae5bc7 100755
--- a/bin/generate_export_file.pl
+++ b/bin/generate_export_file.pl
@@ -32,17 +32,21 @@ print "#  if ($ucname"."_HAS_DLL == 1)\n";
 print "#    if defined ($ucname"."_BUILD_DLL)\n";
 print "#      define $name"."_Export ACE_Proper_Export_Flag\n";
 print "#      define $ucname"."_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)\n";
+print "#      define $ucname"."_SINGLETON_DECLARE ACE_EXPORT_SINGLETON_DECLARE\n";
 print "#    else\n";
 print "#      define $name"."_Export ACE_Proper_Import_Flag\n";
 print "#      define $ucname"."_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)\n";
+print "#      define $ucname"."_SINGLETON_DECLARE ACE_IMPORT_SINGLETON_DECLARE\n";
 print "#    endif /* $ucname"."_BUILD_DLL */\n";
 print "#  else\n";
 print "#    define $name"."_Export\n";
 print "#    define $ucname"."_SINGLETON_DECLARATION(T)\n";
+print "#    define $ucname"."_SINGLETON_DECLARE\n";
 print "#  endif   /* ! $ucname"."_HAS_DLL == 1 */\n";
 print "#else\n";
 print "#  define $name"."_Export\n";
 print "#  define $ucname"."_SINGLETON_DECLARATION(T)\n";
+print "#  define $ucname"."_SINGLETON_DECLARE\n";
 print "#endif     /* $ucname"."_HAS_DLL */\n";
 print "\n";
 print "#endif     /* $ucname"."_EXPORT_H */\n";