1 files changed, 2 insertions, 14 deletions

diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index 05197509721..99caf3105fc 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -61,8 +61,6 @@ void
 Grid_i::set (CORBA::Short x,
              CORBA::Short y,
              CORBA::Long value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Grid::RANGE_ERROR))
 {
   if (x < 0
       || y < 0
@@ -78,14 +76,12 @@ Grid_i::set (CORBA::Short x,
 CORBA::Long
 Grid_i::get (CORBA::Short x,
              CORBA::Short y)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Grid::RANGE_ERROR))
 {
   if (x < 0
       || y < 0
       || x >= width_
       || y >= height_)
-    ACE_THROW_RETURN (Grid::RANGE_ERROR (), -1);
+    throw Grid::RANGE_ERROR ();
   else
     return array_[x][y];
 }
@@ -94,28 +90,24 @@ Grid_i::get (CORBA::Short x,
 
 CORBA::Short
 Grid_i::width (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
 Grid_i::height (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
 }
 
 void
 Grid_i::width (CORBA::Short x)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
 }
 
 void
 Grid_i::height (CORBA::Short y)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
 }
@@ -123,7 +115,6 @@ Grid_i::height (CORBA::Short y)
 // Destroy the grid
 void
 Grid_i::destroy ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
   for (int i = 0; i < height_; i++)
@@ -165,7 +156,6 @@ Grid_Factory_i::~Grid_Factory_i (void)
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
                            CORBA::Short height)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               " (%P|%t) Making a new Grid\n"));
@@ -192,7 +182,7 @@ Grid_Factory_i::make_grid (CORBA::Short width,
                                  height,
                                  pool_t_);
   if (errno == ENOMEM)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+    throw CORBA::NO_MEMORY ();
 
   errno = prev_no;
 
@@ -213,7 +203,6 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 // Shutdown.
 void
 Grid_Factory_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               " (%P|%t) %s\n",
@@ -225,7 +214,6 @@ Grid_Factory_i::shutdown (void)
 
 void
 Grid_Factory_i::cleanup (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *name = "Array";