summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-01 22:58:30 +0000
committernaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-01 22:58:30 +0000
commit9a72651eff02596bfd8d20a1a258b14ac46b1fee (patch)
treea4c8b305a0ee234747d1dcaf3abb9e8b0707cf49
parentcc8deeb0e0dab89668ad9a1214f91c6ae5cc92bb (diff)
downloadATCD-9a72651eff02596bfd8d20a1a258b14ac46b1fee.tar.gz
Added missing template instantiation pragmas.
-rw-r--r--TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp12
-rw-r--r--TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp6
5 files changed, 40 insertions, 0 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp
index 84b8887e0d5..5d2e4077d17 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp
@@ -156,3 +156,11 @@ Audio_Control_Play_State::close (void)
TAO_ORB_Core_instance ()->orb ()->shutdown ();
return;
}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Singleton<Audio_Control_Play_State, ACE_Thread_Mutex>;
+template class ACE_Singleton<Audio_Control_Waiting_State, ACE_Thread_Mutex>;
+#elif defined ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Singleton<Audio_Control_Play_State, ACE_Thread_Mutex>
+#pragma instantiate ACE_Singleton<Audio_Control_Waiting_State, ACE_Thread_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp
index 63a3be6a005..e9374190cd8 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp
@@ -256,3 +256,9 @@ Audio_Control_i::~Audio_Control_i ()
delete this->data_handler_;
delete this->sig_handler_;
}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Singleton<Audio_Control_i, ACE_Null_Mutex>;
+#elif defined ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Singleton<Audio_Control_i, ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
index faa30df58a7..8fd8743ea3a 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
@@ -2933,3 +2933,11 @@ Audio_Global::on_exit_routine(void)
ComCloseConn(serviceSocket);
ComCloseConn(audioSocket);
}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Singleton<Video_Global, ACE_Thread_Mutex>;
+template class ACE_Singleton<Audio_Global, ACE_Thread_Mutex>;
+#elif defined ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Singleton<Video_Global, ACE_Thread_Mutex>
+#pragma instantiate ACE_Singleton<Audio_Global, ACE_Thread_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
index 866f24f1122..0b750c3fc2b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
@@ -481,3 +481,15 @@ Video_Control_Fast_Backward_State::close (void)
{
return;
}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Singleton<Video_Control_Play_State, ACE_Thread_Mutex>;
+template class ACE_Singleton<Video_Control_Fast_Forward_State, ACE_Thread_Mutex>;
+template class ACE_Singleton<Video_Control_Fast_Backward_State, ACE_Thread_Mutex>;
+template class ACE_Singleton<Video_Control_Waiting_State, ACE_Thread_Mutex>;
+#elif defined ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Singleton<Video_Control_Fast_Backward_State, ACE_Thread_Mutex>
+#pragma instantiate ACE_Singleton<Video_Control_Play_State, ACE_Thread_Mutex>
+#pragma instantiate ACE_Singleton<Video_Control_Fast_Forward_State, ACE_Thread_Mutex>
+#pragma instantiate ACE_Singleton<Video_Control_Waiting_State, ACE_Thread_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
index 5db371090c1..1ce8c1f9166 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
@@ -270,3 +270,9 @@ Video_Control_i::~Video_Control_i ()
delete this->data_handler_;
delete this->sig_handler_;
}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Singleton<Video_Control_i, ACE_Null_Mutex>;
+#elif defined ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Singleton<Video_Control_i, ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */