Cleanup TAO_EXPORT_NESTED_CLASSES and simplified the portableserver files. At the moment we are using inlining we also use inlining at the TAO level with all compilers, not only with msvc

    * TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h:
    * TAO/tao/DynamicInterface/Unknown_User_Exception.h:
    * TAO/tao/PortableServer/PortableServer_Functions.h:
    * TAO/tao/PortableServer/PortableServer_WFunctions.h:
    * TAO/tao/orbconf.h:

5 files changed, 6 insertions, 49 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
index 0327b9194c7..732b4bdcb04 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
@@ -19,13 +19,6 @@
 #endif
 #define TAO_EXPORT_MACRO  FtRtEvent_Export
 
-#if defined(TAO_EXPORT_NESTED_CLASSES)
-#if defined(TAO_EXPORT_NESTED_MACRO)
-#undef TAO_EXPORT_NESTED_MACRO
-#endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#define TAO_EXPORT_NESTED_MACRO FtRtEvent_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FtRt
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index 64acf8640b5..3c1a3df33c1 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -30,13 +30,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_DynamicInterface_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.h b/TAO/tao/PortableServer/PortableServer_Functions.h
index 4019b7b79e6..963cda33f77 100644
--- a/TAO/tao/PortableServer/PortableServer_Functions.h
+++ b/TAO/tao/PortableServer/PortableServer_Functions.h
@@ -28,13 +28,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #include "tao/PortableServer/PS_ForwardC.h"
 #include "ace/OS_NS_wchar.h"
 
@@ -43,10 +36,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace PortableServer
 {
   /// Utility functions for the other
-  TAO_NAMESPACE_STORAGE_CLASS char* ObjectId_to_string (
+  extern TAO_PortableServer_Export char* ObjectId_to_string (
     const PortableServer::ObjectId &id);
 
-  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (
+  extern TAO_PortableServer_Export PortableServer::ObjectId *string_to_ObjectId (
     const char *id);
 }
 
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.h b/TAO/tao/PortableServer/PortableServer_WFunctions.h
index 93037692958..00245bf7441 100644
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.h
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.h
@@ -28,13 +28,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #include "tao/PortableServer/PS_ForwardC.h"
 #include "ace/OS_NS_wchar.h"
 
@@ -42,10 +35,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableServer
 {
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar* ObjectId_to_wstring (
+  extern TAO_PortableServer_Export CORBA::WChar* ObjectId_to_wstring (
     const PortableServer::ObjectId &id);
 
-  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (
+  extern TAO_PortableServer_Export PortableServer::ObjectId *wstring_to_ObjectId (
     const CORBA::WChar *id);
 }
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 56311856c82..99ca81fbe1e 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -186,22 +186,16 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 # define TAO_CONNECTION_CACHE_MAXIMUM (ACE::max_handles () / 2)
 #endif /* TAO_CONNECTION_CACHE_MAXIMUM */
 
-// This definition theoretically is not required. Just leaving it here
-// for backward compatibility
-#define TAO_NAMESPACE_STORAGE_CLASS extern TAO_EXPORT_MACRO
-
-# if defined (_MSC_VER) && defined (__ACE_INLINE__)
+# if defined (__ACE_INLINE__)
 #   define TAO_NAMESPACE_INLINE_FUNCTION inline
 # else
-#   define TAO_NAMESPACE_INLINE_FUNCTION TAO_NAMESPACE_STORAGE_CLASS
+#   define TAO_NAMESPACE_INLINE_FUNCTION extern TAO_EXPORT_MACRO
 # endif
 
 #if !defined(TAO_NO_COPY_OCTET_SEQUENCES)
 # define TAO_NO_COPY_OCTET_SEQUENCES 1
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES */
 
-#define TAO_HAS_EXCEPTIONS
-
 // Define if your processor does not store words with the most significant
 // byte first.
 
@@ -237,15 +231,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #undef major
 #endif /* major*/
 
-#if !defined (TAO_EXPORT_NESTED_CLASSES) \
-    && defined (ACE_EXPORT_NESTED_CLASSES)
-#define TAO_EXPORT_NESTED_CLASSES
-#endif /* !defined TAO_EXPORT_NESTED_CLASSES */
-
-#if !defined (TAO_EXPORT_NESTED_MACRO)
-#define TAO_EXPORT_NESTED_MACRO
-#endif /* !defined (TAO_EXPORT_NESTED_MACRO) */
-
 // Assume DOS/Windows if "configure" didn't get run.
 
 #if defined (_MSC_VER)