diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-04-07 01:10:27 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-04-07 01:10:27 +0000 |
| commit | f664cf620c109548ea1a1470c3e8d5c063ddcff0 (patch) | |
| tree | 2dc2d26bf8273db5ddd3f1cf65c93edb2e8d8678 /ace/Task.cpp | |
| parent | a6a83d7767a38599f06478d9c1c5f6c076b3a480 (diff) | |
| download | ATCD-f664cf620c109548ea1a1470c3e8d5c063ddcff0.tar.gz | |
removed ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
Diffstat (limited to 'ace/Task.cpp')
| -rw-r--r-- | ace/Task.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ace/Task.cpp b/ace/Task.cpp index ab1cc7016db..68388a29071 100644 --- a/ace/Task.cpp +++ b/ace/Task.cpp @@ -10,10 +10,10 @@ #include "ace/Task.i" #endif /* __ACE_INLINE__ */ -#if defined (ACE_MT_SAFE) && !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) +#if defined (ACE_MT_SAFE) // Lock the creation of the Singleton. ACE_Thread_Mutex ACE_Task_Exit::ace_task_lock_; -#endif /* defined (ACE_MT_SAFE) && !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */ +#endif /* defined (ACE_MT_SAFE) */ // NOTE: this preprocessor directive should match the one in // ACE_Task_Base::svc_run () below. This prevents the two statics @@ -24,12 +24,6 @@ ACE_Task_Exit::instance (void) { ACE_TRACE ("ACE_Task_Exit::instance"); -#if defined (ACE_MT_SAFE) && defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - // Lock the creation of the Singleton. This should be inside of - // ACE_Svc_Handler, but GNU G++ is too lame to handle this... - static ACE_Thread_Mutex ace_task_lock_; -#endif /* defined (ACE_MT_SAFE) && defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */ - // Determines if we were dynamically allocated. static ACE_TSS_TYPE (ACE_Task_Exit) *instance_; |