ChangeLogTag:Sat Jan 10 14:08:09 1998 <coryan@MILONGA>

4 files changed, 18 insertions, 9 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 8dd354736bf..c0e2f74b11f 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,12 @@
+Sat Jan 10 14:08:09 1998    <coryan@MILONGA>
+
+	* TAO_IDL/be/be_array.cpp: 
+	* TAO_IDL/be/be_exception.cpp: 
+	* TAO_IDL/be/be_interface.cpp: 
+	  We no longer generate names with CORBA_1 or CORBA_3 macros, but
+	  sometimes we cannot use the typedefs in CORBA:: because some
+	  weird MSVC++ features (bugs?).
+
 Fri Jan 09 21:37:39 1998    <coryan@MILONGA>
 
 	* TAO_IDL/be/be_typedef.cpp: 
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index 8828a3d2b71..c26f44ecf46 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -1125,7 +1125,7 @@ be_array::gen_forany_defn (void)
   // generate the private section
   *ch << "private:\n";
   ch->incr_indent ();
-  *ch << "friend ACE_CORBA_1 (Any);" << nl;
+  *ch << "friend CORBA::Any;" << nl;
   *ch << this->local_name () << "_slice *ptr_;" << nl;
   *ch << "CORBA::Boolean nocopy_;\n";
 
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
index 09d4446d1eb..95332e2fefa 100644
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ b/TAO/TAO_IDL/be/be_exception.cpp
@@ -208,7 +208,7 @@ be_exception::gen_client_inline (void)
       *ci << "// default constructor" << nl;
       *ci << "ACE_INLINE" << nl;
       *ci << this->name () << "::" << this->local_name () << " (void)" << nl;
-      *ci << "\t: CORBA_UserException (ACE_CORBA_3 (TypeCode, _duplicate) (" <<
+      *ci << "\t: CORBA_UserException (CORBA::TypeCode::_duplicate (" <<
         this->tc_name () << "))\n";
       *ci << "{" << nl;
       *ci << "}\n\n";
@@ -266,8 +266,8 @@ be_exception::gen_client_stubs (void)
       *cs << "// copy constructor" << nl;
       *cs << this->name () << "::" << this->local_name () << "(const " <<
         this->name () << " &_tao_excp)" << nl;
-      *cs << "\t:ACE_CORBA_1 (UserException) (" <<
-        "ACE_CORBA_3 (TypeCode, _duplicate) (_tao_excp.type ()))" << nl;
+      *cs << "\t:CORBA_UserException (" <<
+        "CORBA::TypeCode::_duplicate (_tao_excp.type ()))" << nl;
       *cs << "{\n";
       cs->incr_indent ();
       // assign each individual member
@@ -289,7 +289,7 @@ be_exception::gen_client_stubs (void)
       *cs << "{\n";
       cs->incr_indent ();
       *cs << "this->type_ = " <<
-        "ACE_CORBA_3 (TypeCode, _duplicate) (_tao_excp.type ());\n";
+        "CORBA::TypeCode::_duplicate (_tao_excp.type ());\n";
       // assign each individual member
       if (be_scope::gen_client_stubs () == -1)
         {
@@ -323,7 +323,7 @@ be_exception::gen_client_stubs (void)
           *cs  << ")" << nl;
 
           *cs << "\t: CORBA_UserException " <<
-            "(ACE_CORBA_3 (TypeCode, _duplicate) (" << this->tc_name () <<
+            "(CORBA::TypeCode::_duplicate (" << this->tc_name () <<
             "))" << nl;
           *cs << "{\n";
           cs->incr_indent ();
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index fc728411856..dadfcd383a0 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -220,7 +220,7 @@ int be_interface::gen_client_header (void)
         {
           // we do not inherit from anybody, hence we do so from the base
           // CORBA::Object class
-          *ch << ": public virtual ACE_CORBA_1 (Object)" << nl;
+          *ch << ": public virtual CORBA::Object" << nl;
         }
 
       // generate the body
@@ -432,7 +432,7 @@ int be_interface::gen_client_stubs (void)
   *cs << "\treturn 1; // success using local knowledge\n";
   cs->decr_indent ();
   *cs << "else" << nl;
-  *cs << "\treturn ACE_CORBA_3 (Object, _is_a) (value, env); // remote call\n";
+  *cs << "\treturn this->CORBA_Object::_is_a (value, env); // remote call\n";
   cs->decr_indent ();
   *cs << "}\n\n";
 
@@ -718,7 +718,7 @@ be_interface::gen_client_inline (void)
   *ci << "ACE_INLINE" << nl;
   *ci << this->name () << "::" << this->local_name () <<
     " (STUB_Object *objref) // constructor" << nl;
-  *ci << "\t: ACE_CORBA_1 (Object) (objref)" << nl;
+  *ci << "\t: CORBA_Object (objref)" << nl;
   *ci << "{}" << nl << nl;
 
   *ci << "ACE_INLINE" << nl;