diff options
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp | 4 | ||||
| -rw-r--r-- | CIAO/tools/Config_Handlers/Utils/XML_Helper.h | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index bba1218d8c8..bca0913e401 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Sun Sep 10 09:20:18 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Utils/XML_Helper.cpp + * tools/Config_Handlers/Utils/XML_Helper.h + + Removed workaround from previous commit, as Ossama Othman has + provided the proper fix in the G++ macros. + Fri Sep 8 00:28:27 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> * tools/Config_Handlers/Utils/XML_Helper.cpp diff --git a/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp b/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp index ec4cb77dc20..fc9fd07f809 100644 --- a/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp +++ b/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp @@ -232,9 +232,9 @@ namespace CIAO } } } -// #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton< CIAO::Config_Handlers::XML_Helper, ACE_Null_Mutex> * ACE_Singleton<CIAO::Config_Handlers::XML_Helper, ACE_Null_Mutex>::singleton_; -//#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/CIAO/tools/Config_Handlers/Utils/XML_Helper.h b/CIAO/tools/Config_Handlers/Utils/XML_Helper.h index 6b42bc0f5bb..f408c3e8abb 100644 --- a/CIAO/tools/Config_Handlers/Utils/XML_Helper.h +++ b/CIAO/tools/Config_Handlers/Utils/XML_Helper.h @@ -76,12 +76,9 @@ namespace CIAO } } -#ifdef _MSC_VER CIAO_XML_UTILS_SINGLETON_DECLARE (ACE_Singleton, CIAO::Config_Handlers::XML_Helper, ACE_Null_Mutex); -#endif - namespace CIAO { namespace Config_Handlers |