Fix exception specifications

7 files changed, 42 insertions, 8 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
index 94a83e2f24f..b86ebf34dac 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
@@ -3264,6 +3264,7 @@ Receiver_i::push_mmdevice (CORBA::Object_ptr audio_mmdevice,
                                  CORBA::Object_ptr video_mmdevice,
                                  const char *video_file,
                                  CORBA::Environment&)
+                          ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t)Receiver_i::push_audio_mmdevice"));
   this->command_handler_->set_mmdevice (audio_mmdevice,audio_file,video_mmdevice,video_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
index a6ec7b1d646..8f35c9758d0 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
@@ -84,7 +84,8 @@ class Receiver_i
                       const char* audio_file,
                       CORBA::Object_ptr video_mmdevice,
                       const char *video_file,
-                      CORBA::Environment&);
+                      CORBA::Environment&)
+                     ACE_THROW_SPEC (( CORBA::SystemException ));
 
  private:
   Command_Handler *command_handler_;
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 fc3a05d96ef..c5476e5b874 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
@@ -30,6 +30,7 @@ CORBA::Boolean
 Audio_Control_i::init_audio (const Audio_Control::INITaudioPara & para,
                              Audio_Control::INITaudioReply_out reply,
                              CORBA::Environment &env)
+                          ACE_THROW_SPEC(( CORBA::SystemException )) 
 {
   int result;
   int failureType; /* 0 - can't open file, 1 - can't open live source */
@@ -124,6 +125,7 @@ CORBA::Boolean
 Audio_Control_i::play (const Audio_Control::PLAYPara & para,
                        CORBA::Long_out ats,
                        CORBA::Environment &env)
+               ACE_THROW_SPEC (( CORBA::SystemException ))
 
 {
   return this->state_->play (para,ats);
@@ -132,6 +134,7 @@ Audio_Control_i::play (const Audio_Control::PLAYPara & para,
 CORBA::Boolean 
 Audio_Control_i::speed (const Audio_Control::SPEEDPara & para,
                         CORBA::Environment &env)
+              ACE_THROW_SPEC (( CORBA::SystemException ))
 
 {
   return this->state_->speed (para);
@@ -140,6 +143,7 @@ Audio_Control_i::speed (const Audio_Control::SPEEDPara & para,
 CORBA::Boolean 
 Audio_Control_i::stop (CORBA::Long cmdsn,
                        CORBA::Environment &env)
+              ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return this->state_->stop (cmdsn);
 }
@@ -147,6 +151,7 @@ Audio_Control_i::stop (CORBA::Long cmdsn,
 CORBA::Boolean
 Audio_Control_i::set_peer (char *&peer,
                            CORBA::Environment &env)
+                 ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   char* peer_addr_str = new char [BUFSIZ];
   ACE_OS::strcpy (peer_addr_str,peer);
@@ -217,6 +222,7 @@ Audio_Control_i::set_peer (char *&peer,
 
 void
 Audio_Control_i::close (CORBA::Environment &env)
+        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   this->state_->close ();
   return;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.h
index 001bfccb423..28723bab228 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.h
@@ -27,32 +27,38 @@ public:
       const Audio_Control::INITaudioPara & para,
       Audio_Control::INITaudioReply_out reply_para,
       CORBA::Environment &_tao_environment
-     ) ;
+     )
+     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean play (
       const Audio_Control::PLAYPara & para,
       CORBA::Long_out ats,
       CORBA::Environment &_tao_environment
-     ) ;
+     ) 
+     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean speed (
       const Audio_Control::SPEEDPara & para,
       CORBA::Environment &_tao_environment
-     ) ;
+     ) 
+     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean stop (
       CORBA::Long cmdsn,
       CORBA::Environment &_tao_environment
-     ) ;
+     ) 
+     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean set_peer (
                                    char *&peer,
       CORBA::Environment &_tao_environment
-     ) ;
+     ) 
+     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual void close (
       CORBA::Environment &_tao_environment
-      ) ;
+      ) 
+     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   void change_state (Audio_Control_State *state);
   // Changes the state of the Audio Control object.
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 37193685728..584116d958b 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
@@ -30,6 +30,7 @@ CORBA::Boolean
 Video_Control_i::init_video (const Video_Control::INITvideoPara &para,
                              Video_Control::INITvideoReply_out reply,
                              CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Video_Control_i::init_video () called\n"));
@@ -47,6 +48,7 @@ CORBA::Boolean
 Video_Control_i::stat_stream (CORBA::Char_out ch,
                               CORBA::Long_out size,
                               CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return 0;
 }
@@ -54,6 +56,7 @@ Video_Control_i::stat_stream (CORBA::Char_out ch,
 
 void
 Video_Control_i::close (CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   ACE_DEBUG ((LM_DEBUG, 
               "(%P|%t) Video_Control_i::close:"
@@ -66,6 +69,7 @@ Video_Control_i::close (CORBA::Environment& env)
 
 CORBA::Boolean 
 Video_Control_i::stat_sent (CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return 0;
 }
@@ -74,6 +78,7 @@ Video_Control_i::stat_sent (CORBA::Environment& env)
 CORBA::Boolean 
 Video_Control_i::fast_forward (const Video_Control::FFpara &para,
                                CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return this->state_->fast_forward (para);
 }
@@ -82,6 +87,7 @@ Video_Control_i::fast_forward (const Video_Control::FFpara &para,
 CORBA::Boolean 
 Video_Control_i::fast_backward (const Video_Control::FFpara &para,
                                 CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return this->state_->fast_backward (para);
 }
@@ -90,6 +96,7 @@ Video_Control_i::fast_backward (const Video_Control::FFpara &para,
 CORBA::Boolean 
 Video_Control_i::step (const Video_Control::STEPpara &para,
                        CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return this->state_->step (para);
 }
@@ -101,6 +108,7 @@ CORBA::Boolean
 Video_Control_i::play (const Video_Control::PLAYpara &para,
                        CORBA::Long_out vts,
                        CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return this->state_->play (para,
                              vts);
@@ -110,6 +118,7 @@ Video_Control_i::play (const Video_Control::PLAYpara &para,
 CORBA::Boolean 
 Video_Control_i::position (const Video_Control::POSITIONpara &para,
                            CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return this->state_->position (para);
 }
@@ -118,6 +127,7 @@ Video_Control_i::position (const Video_Control::POSITIONpara &para,
 CORBA::Boolean 
 Video_Control_i::speed (const Video_Control::SPEEDpara &para,
                         CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Video_Control_i::speed () called\n"));
@@ -128,6 +138,7 @@ Video_Control_i::speed (const Video_Control::SPEEDpara &para,
 CORBA::Boolean 
 Video_Control_i::stop (CORBA::Long cmdsn,
                        CORBA::Environment& env)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return this->state_->stop (cmdsn);
 }
@@ -135,6 +146,7 @@ Video_Control_i::stop (CORBA::Long cmdsn,
 CORBA::Boolean
 Video_Control_i::set_peer (char * &peer,
                            CORBA::Environment &ACE_TRY_ENV)
+                        ACE_THROW_SPEC (( CORBA::SystemException ))
 {
 
   
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp
index 57050ed69ba..5cb96e4a0c4 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp
@@ -23,6 +23,10 @@ Audio_MMDevice::create_B (AVStreams::StreamCtrl_ptr the_requester,
                         char *&named_vdev,
                         const AVStreams::flowSpec &the_spec,
                         CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC (( CORBA::SystemException, AVStreams::streamOpFailed,
+      AVStreams::streamOpDenied, AVStreams::notSupported,
+      AVStreams::QoSRequestFailed, AVStreams::noSuchFlow ))
+
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) Audio_MMDevice::create_B called \n"));
   AVStreams::StreamEndPoint_B_ptr stream_ptr;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h
index e263670efaa..922e79f68f0 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h
@@ -65,7 +65,11 @@ public:
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
                                                      const AVStreams::flowSpec &the_spec,
-                                                     CORBA::Environment &env);
+                                                     CORBA::Environment &env)
+    ACE_THROW_SPEC (( CORBA::SystemException, AVStreams::streamOpFailed,
+      AVStreams::streamOpDenied, AVStreams::notSupported,
+      AVStreams::QoSRequestFailed, AVStreams::noSuchFlow ));
+
   // Called by StreamCtrl to create a "B" type streamandpoint and vdev
 
   int connections (void);