ChangeLogTag:Sun Oct 23 21:48:15 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

7 files changed, 43 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 68be29e8a90..7f4a2493785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Sun Oct 23 21:48:15 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* ace/README:
+
+	  Added documentation that describes how to override the default
+	  versioned namespace name when ACE_HAS_VERSIONED_NAMESPACE is
+	  defined.
+
+	* ace/Version.h:
+
+	  Removed "ace/Versioned_Namespace.h" include directive.  It
+	  caused some resource compilers on Windows some grief.
+
+	* ace/Versioned_Namespace.h:
+
+	  Updated required header filename in preprocessor error message.
+	  This header should now be included through "ace/config-lite.h".
+
+	* ace/config-lite.h:
+
+	  Include "ace/Version.h" and "ace/Versioned_Namespace.h" to pull
+	  in versioned namespace support (disabled by default).
+
+	* ace/post.h:
+	* ace/pre.h:
+
+	  Removed versioned namespace support.  Versioned namespace
+	  declarations must now be added directly to the appropriate ACE
+	  library headers.  Addresses premature closure of versioned
+	  namespace.
+
 Sun Oct 23 06:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/MakeProjectCreator/templates/bor.mpd:
diff --git a/ace/README b/ace/README
index 3466cea8145..f1a6acde42b 100644
--- a/ace/README
+++ b/ace/README
@@ -729,7 +729,11 @@ ACE_HAS_VERSIONED_NAMESPACE             Wrap all library code within a
                                         prevent symbol conflicts with
                                         other versions of ACE shared
                                         libraries in third party
-                                        libraries.
+                                        libraries.  Default namespace
+                                        name may be overridden by
+                                        defining preprocessor symbol
+                                        ACE_VERSIONED_NAMESPACE_NAME
+                                        to desired name.
 ACE_LACKS_INTMAX_T                      Platform lacks the intmax_t type
 ACE_LACKS_UINTMAX_T			Platform lacks the uintmax_t type.
 ACE_LACKS_INTPTR_T                      Platform lacks the intptr_t type
diff --git a/ace/Version.h b/ace/Version.h
index a6f0fcda21c..d55c0f57335 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -6,4 +6,3 @@
 #define ACE_BETA_VERSION 7
 #define ACE_VERSION "5.4.7"
 
-#include "ace/Versioned_Namespace.h"
diff --git a/ace/Versioned_Namespace.h b/ace/Versioned_Namespace.h
index 32a44d32f76..8b370768dbe 100644
--- a/ace/Versioned_Namespace.h
+++ b/ace/Versioned_Namespace.h
@@ -17,8 +17,8 @@
 #ifndef ACE_VERSIONED_NAMESPACE_H
 #define ACE_VERSIONED_NAMESPACE_H
 
-#ifndef ACE_MAJOR_VERSION
-# error This header is only meant to be included by "ace/Version.h".
+#ifndef ACE_CONFIG_LITE_H
+# error This header is only meant to be included by "ace/config-lite.h".
 #endif  /* !ACE_MAJOR_VERSION */
 
 
diff --git a/ace/config-lite.h b/ace/config-lite.h
index abe7440b607..74475e0225a 100644
--- a/ace/config-lite.h
+++ b/ace/config-lite.h
@@ -27,6 +27,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Version.h"
+#include "ace/Versioned_Namespace.h"
+
 // ACE_HAS_TLI is used to decide whether to try any XTI/TLI functionality
 // so if it isn't set, set it. Capabilities and differences between
 // XTI and TLI favor XTI, but when deciding to do anything, as opposed to
diff --git a/ace/post.h b/ace/post.h
index 9efd1c57c1f..e39a3f9fa24 100644
--- a/ace/post.h
+++ b/ace/post.h
@@ -7,20 +7,11 @@
  *  $Id$
  *
  *  @author Christopher Kohlhoff <chris@kohlhoff.com>
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *
- *  This file restores the original alignment rules, and closes
- *  the versioned namespace (if enabled by the user).
  *
+ *  This file restores the original alignment rules.
  */
 //=============================================================================
 
-
-// No need to include header defining this macro.  It should have
-// already been pulled in by ace/pre.h.
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-
 // No header guard
 #if defined (_MSC_VER)
 # pragma pack (pop)
diff --git a/ace/pre.h b/ace/pre.h
index 8b814939069..8a7d7774c64 100644
--- a/ace/pre.h
+++ b/ace/pre.h
@@ -7,19 +7,12 @@
  *  $Id$
  *
  *  @author Christopher Kohlhoff <chris@kohlhoff.com>
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
  *
  *  This file saves the original alignment rules and changes the alignment
- *  boundary to ACE's default, and opens a versioned namespace
- *  declaration (if enabled by the user).
- *
+ *  boundary to ACE's default.
  */
 //=============================================================================
 
-// Versioned namespace (disabled by default)
-#include "ace/Version.h"
-
-
 // No header guard
 #if defined (_MSC_VER)
 # pragma warning (disable:4103)
@@ -29,8 +22,3 @@
 # pragma nopushoptwarn
 # pragma nopackwarning
 #endif
-
-#ifndef ACE_NAMESPACE_VERSION_ENTERED
-#define ACE_NAMESPACE_VERSION_ENTERED
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-#endif