summaryrefslogtreecommitdiff
path: root/TAO/tao/ORB_Table.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
commitdef7f77b296680b164a6c8ff1e69d9d9c433fe2f (patch)
tree09e01f05117ff081bebb8e250aaf3781d2100612 /TAO/tao/ORB_Table.cpp
parent3db1464004f31b6a9d073021851b7ea98c99fcf8 (diff)
downloadATCD-def7f77b296680b164a6c8ff1e69d9d9c433fe2f.tar.gz
ChangeLogTag: Fri Aug 26 09:49:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/ORB_Table.cpp')
-rw-r--r--TAO/tao/ORB_Table.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index 80ce3562e0f..134f5c699df 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -178,16 +178,8 @@ TAO::ORB_Table::instance (void)
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
template TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX> * TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */