ChangeLogTag: Thu Aug 12 20:55:44 1999 David L. Levine <levine@cs.wustl.edu>

18 files changed, 56 insertions, 34 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 01f7e932a0f..f2a1bab7525 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,7 +1,21 @@
+Thu Aug 12 20:55:44 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * tao/orbconf.h: added TAO_NAMESPACE_CLOSE.  It must now
+          be used with TAO_NAMESPACE.  Removed trailing ; from
+          TAO_NAMESPACE_END with ACE_HAS_USING_KEYWORD. [Bug 218]
+
+        * TAO_IDL/be/be_visitor_module/module_ch.cpp,
+          TAO_IDL/be/be_visitor_module/module_sh.cpp,
+          TAO_IDL/be/be_visitor_valuetype/obv_module.cpp,
+          tao/CONV_FRAME[CS].h,tao/IO[PR][CS].h,
+          tao/Messaging[CS].h,tao/POA[CS].h,tao/PollableS.h,
+          tao/TimeBaseC.h,tao/corbafwd.h: added TAO_NAMESPACE_CLOSE
+          corresponding to each TAO_NAMESPACE.
+
 Thu Aug 12 20:50:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-	* Makefile:
-	  Added missing '\'
+        * Makefile:
+          Added missing '\'
 
 Thu Aug 12 19:54:19 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
index bdecfc4e071..12ee2c177af 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
@@ -1,4 +1,3 @@
-//
 // $Id$
 //
 
@@ -18,9 +17,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_module.h"
 
@@ -57,7 +56,7 @@ be_visitor_module_ch::visit_module (be_module *node)
       os->indent (); // start from whatever indentation level we were at
       // now generate the class definition
       *os << "TAO_NAMESPACE " // << idl_global->stub_export_macro ()
-	  << " " << node->local_name () << be_nl
+          << " " << node->local_name () << be_nl
           << "{\n";
       os->incr_indent (0);
 
@@ -73,7 +72,7 @@ be_visitor_module_ch::visit_module (be_module *node)
         }
 
       *os << be_uidt_nl
-          << "}; // module " << node->name () << "\n\n";
+          << "}\nTAO_NAMESPACE_CLOSE // module " << node->name () << "\n\n";
 
     }
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
index c2eabbdf962..40c3b1d98ca 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
@@ -1,4 +1,3 @@
-//
 // $Id$
 //
 
@@ -18,9 +17,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_module.h"
 
@@ -76,7 +75,7 @@ be_visitor_module_sh::visit_module (be_module *node)
         }
 
       os->decr_indent ();
-      *os << "};\n\n";
+      *os << "}\nTAO_NAMESPACE_CLOSE\n\n";
     }
   return 0;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
index 1429a4d15cd..52e995e47e5 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
@@ -84,7 +84,7 @@ be_visitor_obv_module::visit_module (be_module *node)
       if (this->ctx_->state () == TAO_CodeGen::TAO_MODULE_OBV_CH)
         {
           os->decr_indent ();
-          *os << "};\n\n";
+          *os << "}\nTAO_NAMESPACE_CLOSE\n\n";
         }
     }
   return 0;
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index ccfed2dbb0b..8673232b6cf 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -1,4 +1,3 @@
-//
 // $Id$
 //
 // ================================================================
@@ -324,7 +323,8 @@ TAO_NAMESPACE  CONV_FRAME
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetContext;
 
 
-}; // module CONV_FRAME
+}
+TAO_NAMESPACE_CLOSE // module CONV_FRAME
 
 void TAO_Export operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version
 void TAO_Export operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version
diff --git a/TAO/tao/CONV_FRAMES.h b/TAO/tao/CONV_FRAMES.h
index e0cd5f4a47c..0974032e865 100644
--- a/TAO/tao/CONV_FRAMES.h
+++ b/TAO/tao/CONV_FRAMES.h
@@ -1,4 +1,3 @@
-//
 // $Id$
 //
 // ================================================================
@@ -33,7 +32,8 @@
 
 TAO_NAMESPACE  POA_CONV_FRAME
 {
-};
+}
+TAO_NAMESPACE_CLOSE
 
 #include "CONV_FRAMES_T.h"
 
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 8ff683969d4..3d81a5d618f 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -568,8 +568,8 @@ TAO_NAMESPACE  IOP
 
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong UnknownExceptionInfo;
 
-
-}; // module IOP
+}
+TAO_NAMESPACE_CLOSE // module IOP
 
 void TAO_Export operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
 void TAO_Export operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
index 6584475e3a3..5a1ddcba827 100644
--- a/TAO/tao/IOPS.h
+++ b/TAO/tao/IOPS.h
@@ -1,4 +1,3 @@
-//
 // $Id$
 //
 // ================================================================
@@ -33,7 +32,8 @@
 
 TAO_NAMESPACE  POA_IOP
 {
-};
+}
+TAO_NAMESPACE_CLOSE
 
 #include "IOPS_T.h"
 
diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h
index fd5488bef8d..c3d5cef3370 100644
--- a/TAO/tao/IORC.h
+++ b/TAO/tao/IORC.h
@@ -456,7 +456,8 @@ TAO_NAMESPACE  TAO_IOP
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation;
 
 
-}; // module TAO_IOP
+}
+TAO_NAMESPACE_CLOSE // module TAO_IOP
 
 // Any operators for interface TAO_IOP::TAO_IOR_Manipulation
 void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr);
diff --git a/TAO/tao/IORS.h b/TAO/tao/IORS.h
index 121b00547a2..e3e10059f34 100644
--- a/TAO/tao/IORS.h
+++ b/TAO/tao/IORS.h
@@ -195,7 +195,8 @@ TAO_NAMESPACE  POA_TAO_IOP
     TAO_IOR_Manipulation_ptr servant_;
   };
 
-};
+}
+TAO_NAMESPACE_CLOSE
 
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 39a431192d8..e97761b33f1 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -1639,7 +1639,7 @@ TAO_NAMESPACE  Messaging
 
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-  
+
   class TAO_Export ReplyHandler_var
   {
   public:
@@ -1841,7 +1841,8 @@ TAO_NAMESPACE  Messaging
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller;
 #endif /* TAO_POLLER */
 
-}; // module Messaging
+}
+TAO_NAMESPACE_CLOSE // module Messaging
 
 // Typedef for the Reply Handler Skeleton.
 // This is handcrafted not generated by the IDL compiler.
diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h
index 957c74c8064..fcc21b667a2 100644
--- a/TAO/tao/MessagingS.h
+++ b/TAO/tao/MessagingS.h
@@ -1999,7 +1999,8 @@ private:
 #endif /* ACE_HAS_USING_KEYWORD */
 #endif /* TAO_POLLER */
 
-};
+}
+TAO_NAMESPACE_CLOSE
 
 // #include "MessagingS_T.h"
 
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 10f1fce53d2..7268c07c823 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -2284,7 +2284,8 @@ TAO_NAMESPACE PortableServer{
   TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
   TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
 
-};
+}
+TAO_NAMESPACE_CLOSE
 
 #if defined (__ACE_INLINE__)
 #include "POAC.i"
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
index a5213c1b748..e677ae082ca 100644
--- a/TAO/tao/POAS.h
+++ b/TAO/tao/POAS.h
@@ -1205,8 +1205,8 @@ TAO_NAMESPACE POA_PortableServer
 #endif // end #if !defined
 
 
-};
-
+}
+TAO_NAMESPACE_CLOSE
 
 #if defined (__ACE_INLINE__)
 #include "POAS.i"
diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h
index 6c977edd778..28e974ac352 100644
--- a/TAO/tao/PollableS.h
+++ b/TAO/tao/PollableS.h
@@ -219,7 +219,8 @@ private:
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-};
+}
+TAO_NAMESPACE_CLOSE
 
 #include "PollableS_T.h"
 #endif /* 0 */
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index 4f21b84929a..8f72014e9b9 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -128,7 +128,8 @@ TAO_NAMESPACE  TimeBase
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IntervalT;
 
 
-}; // module TimeBase
+}
+TAO_NAMESPACE_CLOSE // module TimeBase
 
 void TAO_Export operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
 void TAO_Export operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 8cba586e8ba..89b05060c9c 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -1628,7 +1628,8 @@ TAO_NAMESPACE CORBA
   // Obtain the thread-specific default environment.
   // This is obsolete and only left here for backwards compatibility.
 
-};  // end of class (namespace) CORBA
+}
+TAO_NAMESPACE_CLOSE  // end of class (namespace) CORBA
 
 // ****************************************************************
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index c1080b3ce4a..bd7b191844c 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -166,13 +166,15 @@
 // behavior of the MSVC++ compiler
 #if defined (ACE_HAS_USING_KEYWORD)
 #define TAO_NAMESPACE namespace
+#define TAO_NAMESPACE_CLOSE
 #define TAO_NAMESPACE_STORAGE_CLASS extern TAO_EXPORT_MACRO
 #define TAO_NAMESPACE_BEGIN(NS)  namespace NS {
-#define TAO_NAMESPACE_END  };
+#define TAO_NAMESPACE_END  }
 #define TAO_NAMESPACE_TYPE(TYPE)
 #define TAO_NAMESPACE_DEFINE(TYPE,NAME,RHS) TYPE NAME = RHS;
 #else
 #define TAO_NAMESPACE struct TAO_EXPORT_MACRO
+#define TAO_NAMESPACE_CLOSE ;
 #define TAO_NAMESPACE_STORAGE_CLASS static
 #define TAO_NAMESPACE_BEGIN(NS)  NS##::
 #define TAO_NAMESPACE_END