2 files changed, 10 insertions, 50 deletions
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
index 1aed52ccf2f..0200835d0a8 100644
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Collocation/Diamond_i.cpp
@@ -14,9 +14,6 @@ Top_i::~Top_i ()
 
 char *
 Top_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("a point.");
 }
@@ -33,18 +30,12 @@ Left_i::~Left_i ()
 
 char *
 Left_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("the left line");
 }
 
 char *
 Left_i::color (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("black");
 }
@@ -61,18 +52,12 @@ Right_i::~Right_i ()
 
 char *
 Right_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("the right line");
 }
 
 char *
 Right_i::color (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("red");
   //
@@ -80,9 +65,6 @@ Right_i::color (void)
 
 CORBA::Long
 Right_i::width (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return 0;
 }
@@ -99,36 +81,24 @@ Buttom_i::~Buttom_i ()
 
 char *
 Buttom_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("a diamond");
 }
 
 char *
 Buttom_i::color (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("translucent");
 }
 
 CORBA::Long
 Buttom_i::width (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return 100;
 }
 
 char *
 Buttom_i::name (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("Jubilee");
 }
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index e57cf1a6468..d8801332823 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -17,8 +17,7 @@ public:
   ~Top_i (void);
   // Ctor and dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 };
 
@@ -29,12 +28,10 @@ public:
   ~Left_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 
-  virtual char * color (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * color (void);
   // Return the color of this object (interface.)
 };
 
@@ -45,16 +42,13 @@ public:
   ~Right_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 
-  virtual char * color (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * color (void);
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long width (void);
   // Return the width of the stuff.
 };
 
@@ -65,20 +59,16 @@ public:
   ~Buttom_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 
-  virtual char * color (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * color (void);
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long width (void);
   // Return the width of the stuff.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Return the name of the object.
 };