diff options
| author | Steve Huston <shuston@riverace.com> | 2002-02-18 23:48:51 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-02-18 23:48:51 +0000 |
| commit | f0efea7f83d2a2e76b746c6bfa08281ecb375d0b (patch) | |
| tree | 3346de6df1b0be43f0bd2f7b070c03b502e6b83b /ace | |
| parent | f8d01b98ec0e613825089b5916d5f92114600a46 (diff) | |
| download | ATCD-f0efea7f83d2a2e76b746c6bfa08281ecb375d0b.tar.gz | |
ChangeLogTag:Mon Feb 18 18:41:33 2002 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Singleton.h | 3 | ||||
| -rw-r--r-- | ace/config-aix-4.x.h | 6 | ||||
| -rw-r--r-- | ace/config-win32-msvc-6.h | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ace/Singleton.h b/ace/Singleton.h index 49d9edb11f1..783c3394613 100644 --- a/ace/Singleton.h +++ b/ace/Singleton.h @@ -184,6 +184,9 @@ protected: /// Contained instance. ACE_TSS_TYPE (TYPE) instance_; + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Singleton<TYPE,ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Singleton (const ACE_TSS_Singleton<TYPE,ACE_LOCK> &)) + #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) /// Pointer to the Singleton (ACE_Cleanup) instance. static ACE_TSS_Singleton<TYPE, ACE_LOCK> *singleton_; diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h index 31947c8acf0..1005ccb8ab6 100644 --- a/ace/config-aix-4.x.h +++ b/ace/config-aix-4.x.h @@ -40,7 +40,6 @@ // These are for Visual Age C++ only # if defined (__IBMCPP__) && (__IBMCPP__ >= 400) -# define ACE_TEMPLATES_REQUIRE_SOURCE # define ACE_HAS_STD_TEMPLATE_SPECIALIZATION # define ACE_HAS_TYPENAME_KEYWORD # undef WIFEXITED @@ -48,6 +47,11 @@ # if (__IBMCPP__ >= 500) /* Visual Age C++ 5 */ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +# if !defined (__TEMPINC__) + // Visual Age C++ 5 without -qtempinc is asking for explicit + // template instantiation. +# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION +# endif /* __TEMPINC__ */ # endif /* __IBMCPP__ >= 500 */ # endif /* __IBMCPP__ */ diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h index 3b21f5a8852..f2049774a53 100644 --- a/ace/config-win32-msvc-6.h +++ b/ace/config-win32-msvc-6.h @@ -1,4 +1,3 @@ - /* -*- C++ -*- */ //============================================================================= /** @@ -117,6 +116,10 @@ // Template specialization is supported. # define ACE_HAS_TEMPLATE_SPECIALIZATION +// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to +// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. +# define ACE_NEEDS_FUNC_DEFINITIONS + // ----------------- "derived" defines and includes ----------- # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) |