Mon Feb 12 13:42:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 23 insertions, 56 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9bce79d36be..141aacb835f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 12 13:42:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * interop-tets/*.{h,cpp}:
+          Removed ACE_THROW_SPEC, layout changes, reduced includes
+
 Mon Feb 12 12:22:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * performance-tests/*.{h,cpp,inl}:
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index df242339900..75f819b6970 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.cpp
+++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp
@@ -39,7 +39,6 @@ interop_WChar_Passer_i::~interop_WChar_Passer_i (void)
 
 char *
 interop_WChar_Passer_i::orb_name (void)
-    ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return CORBA::string_dup ("TAO");
 }
@@ -47,14 +46,12 @@ interop_WChar_Passer_i::orb_name (void)
 CORBA::Boolean
 interop_WChar_Passer_i::wchar_to_server (CORBA::WChar test,
                                          CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_wchar (key,test);
 }
 
 CORBA::WChar
 interop_WChar_Passer_i::wchar_from_server (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.get_wchar (key);
 }
@@ -62,14 +59,12 @@ interop_WChar_Passer_i::wchar_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::wstring_to_server (const CORBA::WChar * test,
                                            CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_wstring(key,test);
 }
 
 CORBA::WChar *
 interop_WChar_Passer_i::wstring_from_server (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return CORBA::wstring_dup (ref_.get_wstring(key));
 }
@@ -77,14 +72,12 @@ interop_WChar_Passer_i::wstring_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::warray_to_server (const interop::warray test,
                                           CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_warray(key,test);
 }
 
 interop::warray_slice *
 interop_WChar_Passer_i::warray_from_server (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return interop::warray_dup (ref_.get_warray(key));
 }
@@ -92,7 +85,6 @@ interop_WChar_Passer_i::warray_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::wstruct_to_server (const interop::wstruct & test,
                                            CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return
     ref_.match_wchar (key,test.st_char) &&
@@ -103,7 +95,6 @@ interop_WChar_Passer_i::wstruct_to_server (const interop::wstruct & test,
 
 interop::wstruct *
 interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wstruct_var ws = new interop::wstruct ();
   ws->st_char = this->wchar_from_server(key);
@@ -116,7 +107,6 @@ interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::wstructseq_to_server (const interop::wstructseq & test,
                                               CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::Boolean result = 1;
   for (CORBA::ULong i = 0; result && i < test.length(); i++)
@@ -128,7 +118,6 @@ interop_WChar_Passer_i::wstructseq_to_server (const interop::wstructseq & test,
 
 interop::wstructseq *
 interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wstructseq_var wsListI = new interop::wstructseq();
   wsListI->length(5);
@@ -151,7 +140,6 @@ interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test,
                                           CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   switch (test._d()) {
   case interop::is_wchar :
@@ -169,7 +157,6 @@ interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test,
 interop::wunion *
 interop_WChar_Passer_i::wunion_from_server (CORBA::Short key,
                                             interop::wchar_types type)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wunion *wu = new interop::wunion ();
   switch (type) {
@@ -190,7 +177,6 @@ interop_WChar_Passer_i::wunion_from_server (CORBA::Short key,
 CORBA::Boolean
 interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
                                        CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::WChar wc;
   const CORBA::WChar *ws;
@@ -215,7 +201,6 @@ interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
 CORBA::Any*
 interop_WChar_Passer_i::any_from_server (CORBA::Short key,
                                          interop::wchar_types type)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::Any *any = new CORBA::Any;
   switch (type) {
@@ -237,15 +222,12 @@ interop_WChar_Passer_i::any_from_server (CORBA::Short key,
 
 CORBA::Any *
 interop_WChar_Passer_i::any_echo (const CORBA::Any &test)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return new CORBA::Any (test);
 }
 
 void
 interop_WChar_Passer_i::exception_test ( CORBA::Short key)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   interop::WChar_Passer::WStringException))
 {
   throw interop::WChar_Passer::WStringException(ref_.get_except(key),
                                                 this->wchar_from_server(key));
@@ -253,7 +235,6 @@ interop_WChar_Passer_i::exception_test ( CORBA::Short key)
 
 void
 interop_WChar_Passer_i::shutdown (void)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   this->orb_->shutdown(0);
 }
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h
index bec5f5c7e3c..c81681f9ca9 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.h
+++ b/TAO/interop-tests/wchar/interop_wchar_i.h
@@ -42,69 +42,50 @@ public:
   //Destructor
   virtual ~interop_WChar_Passer_i (void);
 
-  virtual char * orb_name (void)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual char * orb_name (void);
 
   virtual CORBA::Boolean wchar_to_server (CORBA::WChar test,
-                                          CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                          CORBA::Short key);
 
-  virtual CORBA::WChar wchar_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual CORBA::WChar wchar_from_server (CORBA::Short key);
 
   virtual CORBA::Boolean wstring_to_server (const CORBA::WChar * test,
-                                            CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                            CORBA::Short key);
 
-  virtual CORBA::WChar * wstring_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual CORBA::WChar * wstring_from_server (CORBA::Short key);
 
   virtual CORBA::Boolean warray_to_server (const interop::warray test,
-                                           CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                           CORBA::Short key);
 
-  virtual interop::warray_slice * warray_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual interop::warray_slice * warray_from_server (CORBA::Short key);
 
   virtual CORBA::Boolean wstruct_to_server (const interop::wstruct & test,
-                                            CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                            CORBA::Short key);
 
-  virtual interop::wstruct * wstruct_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual interop::wstruct * wstruct_from_server (CORBA::Short key);
 
   virtual CORBA::Boolean wstructseq_to_server (const interop::wstructseq & test,
-                                            CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                            CORBA::Short key);
 
-  virtual interop::wstructseq * wstructseq_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual interop::wstructseq * wstructseq_from_server (CORBA::Short key);
 
  virtual CORBA::Boolean wunion_to_server (const interop::wunion & test,
-                                           CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                           CORBA::Short key);
 
   virtual interop::wunion * wunion_from_server (CORBA::Short key,
-                                                interop::wchar_types type)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                                interop::wchar_types type);
 
   virtual CORBA::Boolean any_to_server (const CORBA::Any &test,
-                                        CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ));
+                                        CORBA::Short key);
 
   virtual CORBA::Any* any_from_server (CORBA::Short key,
-                                       interop::wchar_types type)
-  ACE_THROW_SPEC (( CORBA::SystemException ));
+                                       interop::wchar_types type);
 
-  virtual CORBA::Any* any_echo (const CORBA::Any &test)
-  ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual CORBA::Any* any_echo (const CORBA::Any &test);
 
-virtual void exception_test (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException,
-                    interop::WChar_Passer::WStringException ));
+virtual void exception_test (CORBA::Short key);
 
-virtual void shutdown (void)
-  ACE_THROW_SPEC (( CORBA::SystemException ));
+virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;