diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server')
6 files changed, 24 insertions, 24 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 125565cd85f..431c582cc2b 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 @@ -159,9 +159,9 @@ Audio_Control_Play_State::close (void) } #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>; +template class ACE_Singleton<Audio_Control_Play_State, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Audio_Control_Waiting_State, TAO_SYNCH_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> +#pragma instantiate ACE_Singleton<Audio_Control_Play_State, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Audio_Control_Waiting_State, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h index e585f00f01b..173f8897e98 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h @@ -76,9 +76,9 @@ public: virtual void close (void); }; -typedef ACE_Singleton <Audio_Control_Waiting_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Audio_Control_Waiting_State, TAO_SYNCH_MUTEX> AUDIO_CONTROL_WAITING_STATE; -typedef ACE_Singleton <Audio_Control_Play_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Audio_Control_Play_State, TAO_SYNCH_MUTEX> AUDIO_CONTROL_PLAY_STATE; #endif /*_MPEG_AUDIO_CONTROL_STATE_H */ 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 05eea8d2e0c..7f792d32392 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp @@ -2950,9 +2950,9 @@ Audio_Global::on_exit_routine(void) } #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>; +template class ACE_Singleton<Video_Global, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Audio_Global, TAO_SYNCH_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> +#pragma instantiate ACE_Singleton<Video_Global, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Audio_Global, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h index c7740c4ccda..9eba48df67d 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h @@ -302,7 +302,7 @@ public: int init_video (void); }; -typedef ACE_Singleton <Video_Global, ACE_SYNCH_MUTEX> VIDEO_SINGLETON; +typedef ACE_Singleton <Video_Global, TAO_SYNCH_MUTEX> VIDEO_SINGLETON; class Video_Timer_Global // A class that holds the static timer variables defined in the middle @@ -392,7 +392,7 @@ public: AudioFeedBackPara * fbpara ; }; -typedef ACE_Singleton <Audio_Global,ACE_SYNCH_MUTEX> AUDIO_GLOBAL; +typedef ACE_Singleton <Audio_Global,TAO_SYNCH_MUTEX> AUDIO_GLOBAL; #endif /* define MPEG_GLOBAL_H */ 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 ca956749958..72141455745 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 @@ -486,13 +486,13 @@ Video_Control_Fast_Backward_State::close (void) } #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>; +template class ACE_Singleton<Video_Control_Play_State, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Video_Control_Fast_Forward_State, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Video_Control_Fast_Backward_State, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Video_Control_Waiting_State, TAO_SYNCH_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> +#pragma instantiate ACE_Singleton<Video_Control_Fast_Backward_State, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Video_Control_Play_State, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Video_Control_Fast_Forward_State, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Video_Control_Waiting_State, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h index 9363a48ea0d..389d1a68230 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h @@ -177,13 +177,13 @@ public: CORBA::Boolean stop (CORBA::Long cmdsn); }; -typedef ACE_Singleton <Video_Control_Waiting_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Video_Control_Waiting_State, TAO_SYNCH_MUTEX> VIDEO_CONTROL_WAITING_STATE; -typedef ACE_Singleton <Video_Control_Play_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Video_Control_Play_State, TAO_SYNCH_MUTEX> VIDEO_CONTROL_PLAY_STATE; -typedef ACE_Singleton <Video_Control_Fast_Forward_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Video_Control_Fast_Forward_State, TAO_SYNCH_MUTEX> VIDEO_CONTROL_FAST_FORWARD_STATE; -typedef ACE_Singleton <Video_Control_Fast_Backward_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Video_Control_Fast_Backward_State, TAO_SYNCH_MUTEX> VIDEO_CONTROL_FAST_BACKWARD_STATE; #endif /* MPEG_VIDEO_SERVER_STATE_H */ |