diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ace/config-g++-common.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 97416077381..5abdbf3e029 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,8 +7,6 @@ Thu Apr 14 23:35:57 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * ace/config-g++-common.h (ACE_EXPORT_SINGLETON_DECLARATION): (ACE_EXPORT_SINGLETON_DECLARE): - (ACE_IMPORT_SINGLETON_DECLARATION): - (ACE_IMPORT_SINGLETON_DECLARE): Define these macros to a suitable C++ expression. Addresses syntax errors. diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h index b225a0b3b22..5b1596128b0 100644 --- a/ace/config-g++-common.h +++ b/ace/config-g++-common.h @@ -74,8 +74,8 @@ # define ACE_Proper_Import_Flag # define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T # define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE<CLASS, LOCK> -#define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T -#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE <CLASS, LOCK>; +#define ACE_IMPORT_SINGLETON_DECLARATION(T) +#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* __GNU__ > 3 */ #if defined (ACE_HAS_GNU_REPO) |