Merged version 94552 from main trunk into this branchalt_mapping_SAIC

2 files changed, 7 insertions, 3 deletions

diff --git a/examples/Simple/echo/Echo_i.h b/examples/Simple/echo/Echo_i.h
index 5afd29de0b1..6211b8ed499 100644
--- a/examples/Simple/echo/Echo_i.h
+++ b/examples/Simple/echo/Echo_i.h
@@ -24,7 +24,7 @@
  *
  * @brief Echo Object Implementation
  *
- * The object implementation  performs teh following functions:
+ * The object implementation  performs the following functions:
  * -- To return the string which needs to be displayed
  * from the server.
  * -- shuts down the server
@@ -55,8 +55,7 @@ private:
   /// ORB pointer.
   CORBA::ORB_var orb_;
 
-  /// Keeping g++ 2.7.2 happy..
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const Echo_i&))
+  void operator= (const Echo_i&);
 };
 
 #endif /* ECHO_I_H */
diff --git a/examples/Simple/echo/server.cpp b/examples/Simple/echo/server.cpp
index 2b8786e5cc2..4c9ab20ae95 100644
--- a/examples/Simple/echo/server.cpp
+++ b/examples/Simple/echo/server.cpp
@@ -33,6 +33,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       sysex._tao_print_exception ("System Exception");
       return -1;
     }
+  catch (const ::CORBA::Exception &e)
+    {
+      e._tao_print_exception ("CORBA exception");
+      return 1;
+    }
 
   return 0;
 }