ChangeLogTag:Thu Jun 3 13:17:50 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

4 files changed, 30 insertions, 12 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index aa29e7d4daf..581206f3741 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,13 @@
+Thu Jun  3 13:17:50 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/varout.h:
+	* tao/Sequence_T.h:
+	  Work around egcs problems with default parameters in templates
+	  and namespaces. Who would ever use that ;-)
+
+	* tao/Exception.cpp:
+	  Fixed problem with VMCID identification in debugging code.
+
 Tue Jun 01 23:48:33 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* tao/corbafwd.h (CORBA): Changed CORBA from a class to a
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 0ac3367e583..7893c797014 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -266,13 +266,12 @@ CORBA_SystemException::print_exception_tao_ (FILE *) const
               "(%P|%t) system exception, ID '%s'\n",
               _id ()));
 
-  int is_tao_exception = 
-    ((this->minor () & 0xFFFFF0000) == TAO_DEFAULT_MINOR_CODE);
+  CORBA::ULong VMCID = this->minor () & 0xFFFFF000;
 
-  if (is_tao_exception)
+  if (VMCID == TAO_DEFAULT_MINOR_CODE)
     {
       const char *location;
-      switch (minor () & 0x00000FF0) {
+      switch (this->minor () & 0x00000FF0) {
       case TAO_INVOCATION_CONNECT_MINOR_CODE :
         location = "invocation connect failed";
         break;
@@ -293,7 +292,7 @@ CORBA_SystemException::print_exception_tao_ (FILE *) const
       }
 
       const char *errno_indication;
-      switch (minor () & 0x0000000F) {
+      switch (this->minor () & 0x0000000F) {
       case TAO_ETIMEDOUT_MINOR_CODE :
         errno_indication = "ETIMEOUT";
         break;
@@ -306,12 +305,12 @@ CORBA_SystemException::print_exception_tao_ (FILE *) const
       default :
         errno_indication = "unknown errno";
       }
-  
+
       ACE_DEBUG ((LM_ERROR,
                   "(%P|%t) TAO exception, "
                   "minor code = %x (%s; %s), "
                   "completed = %s\n",
-                  minor (), location, errno_indication,
+                  this->minor (), location, errno_indication,
                   (completed () == CORBA::COMPLETED_YES) ? "YES" :
                   (completed () == CORBA::COMPLETED_NO) ? "NO" :
                   (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
@@ -322,7 +321,7 @@ CORBA_SystemException::print_exception_tao_ (FILE *) const
       ACE_DEBUG ((LM_ERROR,
                   "(%P|%t) non-TAO exception, "
                   "minor code = %x, completed = %s\n",
-                  minor (),
+                  this->minor (),
                   (completed () == CORBA::COMPLETED_YES) ? "YES" :
                   (completed () == CORBA::COMPLETED_NO) ? "NO" :
                   (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index e2200ad344a..e17df789920 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -429,7 +429,10 @@ public:
                                CORBA::ULong old_length);
   virtual void _downcast (void* target,
                           CORBA_Object* src,
-                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+                          CORBA_Environment &ACE_TRY_ENV
+                          /* = CORBA::default_environment () */);
+  // No default to workaround egcs problem with templates and
+  // namespaces
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
@@ -485,7 +488,10 @@ public:
                                CORBA::ULong old_length);
   virtual void _downcast (void* target,
                           CORBA_Object* src,
-                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+                          CORBA_Environment &ACE_TRY_ENV
+                          /* = CORBA::default_environment () */);
+  // No default to workaround egcs problem with templates and
+  // namespaces
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h
index cb34463a3cb..87a996f0c3d 100644
--- a/TAO/tao/varout.h
+++ b/TAO/tao/varout.h
@@ -14,7 +14,7 @@
 //
 // = AUTHOR
 //   Aniruddha Gokhale <gokhale@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
 #ifndef TAO_VAROUT_H
@@ -84,7 +84,10 @@ public:
   // TAO extension for access to the underlying pointer.
 
   virtual void _downcast (CORBA_Object *base_ptr,
-                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+                          CORBA_Environment &ACE_TRY_ENV
+                          /* = CORBA::default_environment () */);
+  // No default to workaround egcs problem with templates and
+  // namespaces
   virtual CORBA_Object *_upcast (void);
   virtual void _release (void);
   // Implement the TAO_Object_Field methods.