ChangeLogTag:Thu Dec 8 07:20:25 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

5 files changed, 37 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index d9ae7967d8a..c4b64e12f0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Dec  8 07:20:25 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* ace/Dynamic.h:
+	* ace/OS_main.cpp:
+	* ace/OS_main.h:
+	* ace/TSS_Adapter.h:
+
+	  Fixed versioned namespace support.  The versioning macros calls
+	  were missing.
+
 Thu Dec  8 08:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * examples/APG/ThreadSafety/threadsafety.mpc:
diff --git a/ace/Dynamic.h b/ace/Dynamic.h
index 7a7de9e3c70..3c9f9aced43 100644
--- a/ace/Dynamic.h
+++ b/ace/Dynamic.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Dynamic
  *
@@ -63,6 +65,8 @@ private:
   bool is_dynamic_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Dynamic.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/OS_main.cpp b/ace/OS_main.cpp
index 605c22f2a6e..189f831ef2a 100644
--- a/ace/OS_main.cpp
+++ b/ace/OS_main.cpp
@@ -87,8 +87,12 @@ int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */
 }
 #    endif
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  elif !defined (ACE_HAS_WINCE)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #    if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
 int ACE_Main_Base::run (int argc, ACE_TCHAR *argv[])
 {
@@ -115,10 +119,10 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi
 }
 #    endif /* ACE_WIN32 && ACE_USES_WCHAR */
 
-#  else /* ACE_HAS_WINCE */
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+#  else /* ACE_HAS_WINCE */
+
 // CE only gets a command line string;  no argv. So we need to convert it
 // when the main entrypoint expects argc/argv. ACE_ARGV supports this.
 #    include "ace/OS_NS_string.h"
@@ -142,9 +146,8 @@ int ACE_Main_Base::run (HINSTANCE,
   ACE::fini ();
   return i;
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #  endif   /* !ACE_HAS_WINCE */
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
diff --git a/ace/OS_main.h b/ace/OS_main.h
index c2a5113e409..827fc0d8fc4 100644
--- a/ace/OS_main.h
+++ b/ace/OS_main.h
@@ -67,7 +67,9 @@
          || (defined (ACE_PSOS) && defined (ACE_PSOS_LACKS_ARGC_ARGV))
 
 #     define main \
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
 ace_os_main_i (int, char *[]); \
+ACE_END_VERSIONED_NAMESPACE_DECL \
 ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ \
 { \
   ace_os_main_i (argc, argv); /* what the user calls "main" */ \
@@ -82,7 +84,9 @@ typedef int (*ace_main_proc_ptr)(int, char *[]);
 extern ace_main_proc_ptr vx_ace_main_i_ptr;
 
 #     define main \
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
 ace_os_main_i (int, char *[]); \
+ACE_END_VERSIONED_NAMESPACE_DECL \
 int ace_main_i(int, char *[]); \
 int \
 ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
@@ -96,7 +100,9 @@ ace_main_i
 #   elif !defined (ACE_WIN32)
 
 #     define main \
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
 ace_os_main_i (int, char *[]); \
+ACE_END_VERSIONED_NAMESPACE_DECL \
 int \
 ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
 { \
@@ -118,6 +124,8 @@ public:
   virtual int run_i (int, ACE_TCHAR *[]) = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #       define wmain \
 ace_wmain_i (int, ACE_TCHAR *[]); \
 ACE_Export int ace_os_wmain_i (ACE_Main_Base&, int, ACE_TCHAR *[]); \
@@ -135,8 +143,6 @@ ACE_WMAIN (int argc, ACE_TCHAR *argv[]) /* user's entry point, e.g., wmain */ \
 int \
 ace_wmain_i
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 #     else /* ! (ACE_WIN32 && ACE_USES_WCHAR) */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -148,14 +154,18 @@ public:
   virtual int run_i (int, char *[]) = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #       define main \
 ace_main_i (int, char *[]); \
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
 ACE_Export int ace_os_main_i (ACE_Main_Base&, int, char *[]); \
 class ACE_Main : public ACE_Main_Base {int run_i (int, char *[]);}; \
 inline int ACE_Main::run_i (int argc, char *argv[])  \
 { \
   return ace_main_i (argc, argv); \
 } \
+ACE_END_VERSIONED_NAMESPACE_DECL \
 int \
 ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., wmain */ \
 { \
@@ -165,8 +175,6 @@ ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., wmain */ \
 int \
 ace_main_i
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 #     endif /* ACE_WIN32 && ACE_USES_WCHAR */
 
 #   else /* ACE_HAS_WINCE */
diff --git a/ace/TSS_Adapter.h b/ace/TSS_Adapter.h
index b281cddf6ad..d4f20979b46 100644
--- a/ace/TSS_Adapter.h
+++ b/ace/TSS_Adapter.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_TSS_Adapter
  *
@@ -53,5 +55,7 @@ public:
   ACE_THR_DEST func_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_TSS_ADAPTER_H */