ChangeLogTag:Sat Dec 04 10:34:53 1999 Nanbor Wang <nanbor@cs.wustl.edu>

4 files changed, 23 insertions, 16 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 60fecab9cfb..b4798fe60e3 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,10 @@
+Sat Dec 04 10:34:53 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tao/orbconf.h:
+	* tao/corbafwd.h:
+	* tao/POAC.h: Part of my previous change wrt export macros failed
+	  to consider comilers without namespace.
+
 Fri Dec  3 22:00:48 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
 
         * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
@@ -38,7 +45,7 @@ Fri Dec  3 12:37:11 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 	* TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp:
 	* TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp:
 	  Reversed the order of generation of the stub export macro
-	  (if any) and the return type for the Any and CDR 
+	  (if any) and the return type for the Any and CDR
 	  insertion and extraction operators, and for the ostream
 	  operator for exceptions.
 
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 7e95c76b591..9f5984acd67 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -2284,10 +2284,10 @@ TAO_NAMESPACE PortableServer{
 
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Current;
 
-  TAO_Export char *ObjectId_to_string (const PortableServer::ObjectId &id);
-  TAO_Export CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
-  TAO_Export PortableServer::ObjectId *string_to_ObjectId (const char *id);
-  TAO_Export PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
+  TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
+  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
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 7b518b03811..9fe25d5395d 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -703,11 +703,11 @@ TAO_NAMESPACE CORBA
 
   // = String memory management.
   TAO_NAMESPACE_INLINE_FUNCTION Char* string_alloc (ULong len);
-  TAO_Export  Char* string_dup (const Char *);
+  TAO_NAMESPACE_STORAGE_CLASS  Char* string_dup (const Char *);
   TAO_NAMESPACE_INLINE_FUNCTION void string_free (Char *);
 
   // This is a TAO extension and must go away....
-  TAO_Export Char* string_copy (const Char *);
+  TAO_NAMESPACE_STORAGE_CLASS Char* string_copy (const Char *);
 
   typedef CORBA_String_var String_var;
   typedef CORBA_String_out String_out;
@@ -719,7 +719,7 @@ TAO_NAMESPACE CORBA
 
   // = String memory management routines.
   TAO_NAMESPACE_INLINE_FUNCTION WChar* wstring_alloc (ULong len);
-  TAO_Export  WChar* wstring_dup (const WChar *const);
+  TAO_NAMESPACE_STORAGE_CLASS  WChar* wstring_dup (const WChar *const);
   TAO_NAMESPACE_INLINE_FUNCTION void wstring_free (WChar *const);
 
   typedef CORBA_WString_var WString_var;
@@ -1657,13 +1657,13 @@ TAO_NAMESPACE CORBA
   // There could be a single version of these methods, but g++ 2.7.2
   // gets horribly confused if we used CORBA::default_environment() at
   // this point.
-  TAO_Export ORB_ptr ORB_init (int &argc,
-                               char *argv[],
-                               const char *orb_name = 0);
-  TAO_Export ORB_ptr ORB_init (int &argc,
-                               char *argv[],
-                               const char *orb_name,
-                               CORBA_Environment &ACE_TRY_ENV);
+  TAO_NAMESPACE_STORAGE_CLASS ORB_ptr ORB_init (int &argc,
+                                                char *argv[],
+                                                const char *orb_name = 0);
+  TAO_NAMESPACE_STORAGE_CLASS ORB_ptr ORB_init (int &argc,
+                                                char *argv[],
+                                                const char *orb_name,
+                                                CORBA_Environment &ACE_TRY_ENV);
   // ORB initialisation
 
   // = TAO extensions...
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index fe9eb18fa50..5ad2e5147be 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -191,7 +191,7 @@
 # if defined (_MSC_VER) && defined (__ACE_INLINE__)
 #   define TAO_NAMESPACE_INLINE_FUNCTION inline
 # else
-#   define TAO_NAMESPACE_INLINE_FUNCTION TAO_Export
+#   define TAO_NAMESPACE_INLINE_FUNCTION TAO_NAMESPACE_STORAGE_CLASS
 # endif
 
 // Instead of replacing this with the ACE macro