*** empty log message ***

3 files changed, 15 insertions, 3 deletions

diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp
index 59205605754..48f6dc00535 100644
--- a/ace/Local_Name_Space.cpp
+++ b/ace/Local_Name_Space.cpp
@@ -149,9 +149,15 @@ ACE_NS_Internal::type (void)
 }
 
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
+#if (1)
 template class ACE_Hash_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry <ACE_NS_String, ACE_NS_Internal>;
+#else
+template class ACE_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
+template class ACE_Map_Entry <ACE_NS_String, ACE_NS_Internal>;
+#endif
 template class ACE_Unbounded_Set<ACE_Name_Binding>;
 template class ACE_Unbounded_Set_Iterator<ACE_Name_Binding>;
 template class ACE_Unbounded_Set<ACE_WString>;
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index e223721be91..df5c1f0f30c 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -21,20 +21,26 @@
 #if !defined (ACE_LOCAL_NAME_SPACE_T_H)
 #define ACE_LOCAL_NAME_SPACE_T_H
 
-#include "ace/Hash_Map_Manager.h"
 #include "ace/Name_Space.h"
 #include "ace/Naming_Context.h"
 #include "ace/SString.h"
-#include "ace/Local_Name_Space.h"
 
 // A short-hand name for our set of name/value/type tuples passed back
 // to callers.
 typedef ACE_Unbounded_Set<ACE_WString> ACE_WSTRING_SET;
 
 // Simplify later usage by defining typedefs.
+#if (1)
+#include "ace/Hash_Map_Manager.h"
 typedef ACE_Hash_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex> MAP_MANAGER;
 typedef ACE_Hash_Map_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex> MAP_ITERATOR;
 typedef ACE_Hash_Map_Entry <ACE_NS_String, ACE_NS_Internal> MAP_ENTRY;
+#else
+#include "ace/Map_Manager.h"
+typedef ACE_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex> MAP_MANAGER;
+typedef ACE_Map_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex> MAP_ITERATOR;
+typedef ACE_Map_Entry <ACE_NS_String, ACE_NS_Internal> MAP_ENTRY;
+#endif /* 0 */
 
 template <class ALLOCATOR>
 class ACE_Name_Space_Map : public MAP_MANAGER
diff --git a/ace/OS.h b/ace/OS.h
index ce40e878265..02f2ae9b7a7 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -2350,7 +2350,7 @@ public:
 
   // = A set of wrappers for timers and resource stats.
   static u_int alarm (u_int delay);
-  static hrtime_t gethrtime (void);
+  static ACE_hrtime_t gethrtime (void);
   static ACE_Time_Value gettimeofday (void);
   static int getrusage (int who, struct rusage *rusage);
   static int getrlimit (int resource, struct rlimit *rl);