ChangeLogTag: Fri Feb 13 12:19:58 2004 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 42 insertions, 3 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e41ee2d44b9..0e98708aa53 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Fri Feb 13 12:19:58 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Synch_Invocation.cpp:
+        
+          Cosmetic changes.
+          
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * tao/Exception.cpp:
+        
+          Added deprecations to the TAO_specific _type() method
+          for exceptions. They are no longer used anywhere in ORB
+          code.
+          
+        * docs/compiler.html:
+        
+          Updated the table entry for the -St command line option,
+          pointing out that its use is incompatible with the
+          presence of user exceptions. Thanks to Oliver Kellogg
+          <okellogg@freenet.de> for pointing out this incompatibility
+          situation whose user friendliness index has been neglected
+          for so long.
 
 Fri Feb 13 11:18:21 2004  Huang-Ming Huang  <hh1@cse.wustl.edu>
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 0e2a4b563d3..fbc7cf8f491 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -329,6 +329,13 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "CORBA::TypeCode_ptr " << node->name ()
           << "::_type (void) const" << be_nl;
       *os << "{" << be_idt_nl;
+      *os << "ACE_DEBUG ((LM_DEBUG," << be_nl
+          << "            ACE_LIB_TEXT (\"This TAO-specific method is now\")"
+          << be_nl
+          << "            ACE_LIB_TEXT (\" deprecated and will be removed\")"
+          << be_nl
+          << "            ACE_LIB_TEXT (\" in future versions.\\n\")));"
+          << be_nl << be_nl;
       *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
       *os << "}";
     }
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 30dae65bedd..c764c1461ec 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -709,8 +709,10 @@ also receives other options that are specific to it. <p>
 
     <td>Suppress generation of the TypeCodes</td>
 
-    <td>Also suppresses the generation of the Any operators, since the Any >>= operator needs the
-        associated typecode.</td>
+    <td>Also suppresses the generation of the Any operators, since they need the
+        associated typecode. User exceptions also need the generated typecode, and
+        a user exception in an IDL file compiled with this option will cause a
+        C++ compilation error.</td>
   </tr>
 
   <tr><a name="Sc">
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 9727c96c138..6ce37bd4e65 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -10,6 +10,7 @@
 #include "Typecode.h"
 #include "ORB_Constants.h"
 #include "TC_Constants_Forward.h"
+#include "debug.h"
 
 #include "ace/Malloc.h"
 #include "ace/SString.h"
@@ -142,6 +143,14 @@ CORBA::Exception::_name (void) const
 CORBA::TypeCode_ptr
 CORBA::Exception::_type (void) const
 {
+  if (TAO_debug_level > 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_LIB_TEXT ("This TAO-specific method is now")
+                  ACE_LIB_TEXT (" deprecated and will be removed")
+                  ACE_LIB_TEXT (" in future versions.\n")));
+    }
+            
   return CORBA::TypeCode::_nil ();
 }
 
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 39b4f542a71..6993de6830d 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -483,7 +483,7 @@ namespace TAO
 
     CORBA::Exception *exception =
       this->details_.corba_exception (buf.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
     exception->_tao_decode (cdr