ChangeLogTag: Wed Apr 19 07:44:49 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 13 insertions, 29 deletions

diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index fbf2a092fd8..99d0102e4fc 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -97,28 +97,10 @@ namespace CORBA
    * (in the @c TypeCode) that are generated by any OMG-IDL compiler
    * and available through the Interface Repository.  Think of it as a
    * "globally scoped" name distinguishing each exception.
-   *
-   * @todo According to the OMG CORBA C++ Mapping version 1.1, all
-   *       constructors, copy constructors and assignment operators
-   *       should be moved to "protected" section in class
-   *       declarations.  Since the current MS Visual C++ 6.0 compiler
-   *       will cause some problems to TAO's exception mechanism, we
-   *       defer doing this until we drop support for MSVC++ 6.
    */
   class TAO_Export Exception
   {
   public:
-
-    /// Copy constructor.
-    Exception (const Exception &src);
-
-    /// Assignment operator.
-    Exception & operator = (const Exception & src);
-
-    /// Construct from a respository id.
-    Exception (const char *repository_id,
-               const char *local_name);
-
     /// Destructor.
     virtual ~Exception (void);
 
@@ -199,6 +181,16 @@ namespace CORBA
     /// Default constructor.
     Exception (void);
 
+    /// Copy constructor.
+    Exception (const Exception &src);
+
+    /// Assignment operator.
+    Exception & operator = (const Exception & src);
+
+    /// Construct from a respository id.
+    Exception (const char *repository_id,
+               const char *local_name);
+
   private:
 
     /// Repository Id
@@ -221,19 +213,11 @@ namespace CORBA
 #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
 } // End CORBA namespace
 
-/**
- * @class TAO_Exceptions
- *
- * @brief This class is a namespace for exception-related static data and
- * methods.
- */
-class TAO_Export TAO_Exceptions
+namespace TAO
 {
-public:
-
   /// Create a CORBA::SystemException given the interface repository ID.
-  static CORBA::SystemException *create_system_exception (const char *id);
-};
+  TAO_Export CORBA::SystemException *create_system_exception (const char *id);
+}
 
 TAO_END_VERSIONED_NAMESPACE_DECL