summaryrefslogtreecommitdiff
path: root/TAO/tao/TSS_Resources.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-08-26 09:52:55 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-08-26 09:52:55 +0000
commite147674fbe91916fa8fd2189a9d62c091bebd27c (patch)
tree09e01f05117ff081bebb8e250aaf3781d2100612 /TAO/tao/TSS_Resources.cpp
parentad4a870f8f0b8aa2194a157001ed88cbf5dd45fb (diff)
downloadATCD-e147674fbe91916fa8fd2189a9d62c091bebd27c.tar.gz
ChangeLogTag: Fri Aug 26 09:49:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/TSS_Resources.cpp')
-rw-r--r--TAO/tao/TSS_Resources.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index 516a081dc82..41b705eb8aa 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -4,7 +4,6 @@
#include "GUIResource_Factory.h"
#include "TAO_Singleton.h"
-
ACE_RCSID (tao,
TSS_Resources,
"$Id$")
@@ -41,22 +40,10 @@ TAO_TSS_Resources::instance (void)
TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::instance ();
}
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>;
-template class ACE_TSS<TAO_TSS_Resources>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS<TAO_TSS_Resources>
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
template
TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> *
TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */