ChangeLogTag:Sun Nov 2 16:33:13 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

8 files changed, 44 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 56b8bf1878b..d4db267b177 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Sun Nov  2 16:33:13 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/orbconf.h:
+	  
+	  Removed a couple of macros for namespaces that are no longer
+	  used and absolete. We can now use the keyword namespace
+	  directly. 
+	 
+	  There are few more macros that can go. But that is the next
+	  step. 
+	
+	* tao/CONV_FRAMES.h:
+	* tao/Exception.cpp:
+	* tao/IOPS.h:
+	* tao/IOPS_T.h:
+	* tao/TAOS.h:
+	* tao/Messaging/MessagingS_T.h:
+
+	  Removal of the macro forced us to fudge these files where it was
+	  used. 
+
 Sun Nov  2 16:23:42 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp:
diff --git a/TAO/tao/CONV_FRAMES.h b/TAO/tao/CONV_FRAMES.h
index 50816d9f0a1..61c3b42cc53 100644
--- a/TAO/tao/CONV_FRAMES.h
+++ b/TAO/tao/CONV_FRAMES.h
@@ -32,10 +32,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_NAMESPACE  POA_CONV_FRAME
+namespace  POA_CONV_FRAME
 {
 }
-TAO_NAMESPACE_CLOSE
 
 #include "tao/CONV_FRAMES_T.h"
 
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 63c2c86e7ce..a565085eeb3 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -263,9 +263,10 @@ CORBA::UserException::_info (void) const
 // ****************************************************************
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnknownUserException, 0)
-TAO_NAMESPACE_END
+namespace CORBA
+{
+  TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnknownUserException, 0)
+}
 
 // ****************************************************************
 
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
index 2143a80d739..311449f7b68 100644
--- a/TAO/tao/IOPS.h
+++ b/TAO/tao/IOPS.h
@@ -50,7 +50,7 @@
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
 
-TAO_NAMESPACE  POA_IOP
+namespace  POA_IOP
 {
 
 
@@ -58,7 +58,7 @@ TAO_NAMESPACE  POA_IOP
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 }
-TAO_NAMESPACE_CLOSE // module IOP
+// end module IOP
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h
index b5ab3b15f34..920b9bcb488 100644
--- a/TAO/tao/IOPS_T.h
+++ b/TAO/tao/IOPS_T.h
@@ -35,17 +35,17 @@
 #endif /* _MSC_VER */
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
 
 #if defined (ACE_HAS_USING_KEYWORD)
-TAO_NAMESPACE  POA_IOP
+namespace POA_IOP
 {
 }
-TAO_NAMESPACE_CLOSE // module IOP
+// end module IOP
 #endif /* ACE_HAS_USING_KEYWORD */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h
index 8385fbf078a..e66e649de2e 100644
--- a/TAO/tao/Messaging/MessagingS_T.h
+++ b/TAO/tao/Messaging/MessagingS_T.h
@@ -35,16 +35,16 @@
 #endif /* _MSC_VER */
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
 
 #if defined (ACE_HAS_USING_KEYWORD)
-TAO_NAMESPACE  POA_Messaging
+namespace POA_Messaging
 {
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
-  
+
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  ReplyHandler_tie : public ReplyHandler
@@ -64,7 +64,7 @@ TAO_NAMESPACE  POA_Messaging
     // ctor with T*, ownership flag and a POA
     ~ReplyHandler_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -76,26 +76,26 @@ TAO_NAMESPACE  POA_Messaging
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-  
+
   private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ReplyHandler_tie (const ReplyHandler_tie &);
     void operator= (const ReplyHandler_tie &);
   };
 }
-TAO_NAMESPACE_CLOSE // module Messaging
+// end module Messaging
 #endif /* ACE_HAS_USING_KEYWORD */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h
index f3c404973cf..3dcfe52ff45 100644
--- a/TAO/tao/TAOS.h
+++ b/TAO/tao/TAOS.h
@@ -23,10 +23,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_NAMESPACE  POA_TAO
+namespace  POA_TAO
 {
 }
-TAO_NAMESPACE_CLOSE
+
 
 #include "TAOS_T.h"
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index fee76997a6a..1a008d9eacc 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -174,8 +174,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 
 // This definition theoretically is not required. Just leaving it here
 // for backward compatibility
-#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  }