diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-15 06:37:19 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-15 06:37:19 +0000 |
| commit | cfb996412677e063187e7c683d1876f02420df70 (patch) | |
| tree | d9a2902894f99c458ca858963b8cf0bae7c8d7f3 | |
| parent | 75ff1712933ef9a384595f4b3d98fc0a73ec3560 (diff) | |
| download | ATCD-cfb996412677e063187e7c683d1876f02420df70.tar.gz | |
ChangeLogTag:Thu Apr 14 23:35:57 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ace/Timeprobe.h | 1 | ||||
| -rw-r--r-- | ace/config-g++-common.h | 8 |
3 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 180842fd2a0..97416077381 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Thu Apr 14 23:35:57 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ace/Timeprobe.h: + + Include "ace/Null_Mutex.h" to pull in complete ACE_Null_Mutex + type. Fixes "incomplete type" errors. + + * 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. + Fri Apr 15 07:57:38 2005 Olli Savia <ops@iki.fi> * ace/Ping_Socket.cpp: diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index 359397b7520..c6b96b252c0 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -116,6 +116,7 @@ public: #endif /* __ACE_INLINE__ */ #include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" #include "ace/Singleton.h" #include "ace/Timeprobe_T.h" diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h index 0d43770c64b..b225a0b3b22 100644 --- a/ace/config-g++-common.h +++ b/ace/config-g++-common.h @@ -72,10 +72,10 @@ # define ACE_HAS_CUSTOM_EXPORT_MACROS # define ACE_Proper_Export_Flag __attribute__ ((visibility("default"))) # define ACE_Proper_Import_Flag -# define ACE_EXPORT_SINGLETON_DECLARATION(T) -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# define ACE_IMPORT_SINGLETON_DECLARATION(T) -# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# 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>; #endif /* __GNU__ > 3 */ #if defined (ACE_HAS_GNU_REPO) |