diff options
| author | Huang-Ming Huang <huangh@ociweb.com> | 2016-09-21 14:29:22 -0500 |
|---|---|---|
| committer | Huang-Ming Huang <huangh@ociweb.com> | 2016-09-21 14:29:22 -0500 |
| commit | eb42ae1e7cbce5863f79e4519befccb13e8f9018 (patch) | |
| tree | 543dd2d5675e80f65f7205f4e1ade449e55490dc /TAO/examples | |
| parent | 7771149a115f4225b32990e97b5dc01766058ca4 (diff) | |
| download | ATCD-eb42ae1e7cbce5863f79e4519befccb13e8f9018.tar.gz | |
Fixed all explicit singleton template instantiation
Diffstat (limited to 'TAO/examples')
| -rw-r--r-- | TAO/examples/RTCORBA/Activity/Activity.cpp | 5 | ||||
| -rw-r--r-- | TAO/examples/RTCORBA/Activity/Task_Stats.cpp | 4 | ||||
| -rw-r--r-- | TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp | 4 | ||||
| -rw-r--r-- | TAO/examples/RTScheduling/MIF_Scheduler/test.cpp | 4 | ||||
| -rw-r--r-- | TAO/examples/RTScheduling/Task_Stats.cpp | 5 |
5 files changed, 7 insertions, 15 deletions
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 67ebca5e150..89ff0aa17e5 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -401,6 +401,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return rc; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<Activity, ACE_Null_Mutex> *ACE_Singleton<Activity, ACE_Null_Mutex>::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Activity, ACE_Null_Mutex); + diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index d76aba08b65..9998b2bf3b7 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -138,6 +138,4 @@ Task_Stats::dump_latency_stats ( tmin,tmax); } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX> *ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX>::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Base_Time, TAO_SYNCH_MUTEX); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index df9a095bf50..92b8bcd4242 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -289,6 +289,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return status; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX> *ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX>::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, DT_Test, TAO_SYNCH_MUTEX); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index 33aae3ce537..612fc46bb0f 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp @@ -187,6 +187,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return status; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX> *ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX>::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, DT_Test, TAO_SYNCH_MUTEX); diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp index 37a0f835ef0..053ffaf63a2 100644 --- a/TAO/examples/RTScheduling/Task_Stats.cpp +++ b/TAO/examples/RTScheduling/Task_Stats.cpp @@ -97,6 +97,5 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg) "Samples are ready to view\n")); } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<Task_Stats, TAO_SYNCH_MUTEX> *ACE_Singleton<Task_Stats, TAO_SYNCH_MUTEX>::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Task_Stats, TAO_SYNCH_MUTEX); + |