Finished Other sub-directory

18 files changed, 71 insertions, 59 deletions

diff --git a/ace/Other/Local_Name_Space.cpp b/ace/Other/Local_Name_Space.cpp
index ae892b07f5b..dafc795f228 100644
--- a/ace/Other/Local_Name_Space.cpp
+++ b/ace/Other/Local_Name_Space.cpp
@@ -5,8 +5,8 @@
 #define ACE_LOCAL_NAME_SPACE_C
 
 #include "ace/ACE.h"
-#include "ace/Local_Name_Space.h"
-#include "ace/RW_Process_Mutex.h"
+#include "ace/Other/Local_Name_Space.h"
+#include "ace/Threads/RW_Process_Mutex.h"
 
 ACE_RCSID(ace, Local_Name_Space, "$Id$")
 
diff --git a/ace/Other/Local_Name_Space.h b/ace/Other/Local_Name_Space.h
index 9391cae4053..7b5c18283f9 100644
--- a/ace/Other/Local_Name_Space.h
+++ b/ace/Other/Local_Name_Space.h
@@ -17,14 +17,14 @@
 #define ACE_LOCAL_NAME_SPACE_H
 #include "ace/pre.h"
 
-#include "ace/SString.h"
+#include "ace/Utils/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Malloc_T.h"
-#include "ace/Synch.h"
+#include "ace/Memory/Malloc_T.h"
+#include "ace/Threads/Synch.h"
 
 /**
  * @class ACE_NS_String
@@ -124,7 +124,7 @@ private:
 };
 
 // Include the ACE_Local_Name_Space templates stuff at this point.
-#include "ace/Local_Name_Space_T.h"
+#include "ace/Other/Local_Name_Space_T.h"
 
 #include "ace/post.h"
 #endif /* ACE_LOCAL_NAME_SPACE_H */
diff --git a/ace/Other/Local_Name_Space_T.cpp b/ace/Other/Local_Name_Space_T.cpp
index 8681c76f14f..7712db73dd9 100644
--- a/ace/Other/Local_Name_Space_T.cpp
+++ b/ace/Other/Local_Name_Space_T.cpp
@@ -4,13 +4,13 @@
 #define ACE_LOCAL_NAME_SPACE_T_C
 
 #include "ace/ACE.h"
-#include "ace/Auto_Ptr.h"
+#include "ace/Utils/Templates/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Local_Name_Space.h"
+#include "ace/Other/Local_Name_Space.h"
 
 ACE_RCSID(ace, Local_Name_Space_T, "$Id$")
 
diff --git a/ace/Other/Local_Name_Space_T.h b/ace/Other/Local_Name_Space_T.h
index 344e8a95511..fe0584ecbc9 100644
--- a/ace/Other/Local_Name_Space_T.h
+++ b/ace/Other/Local_Name_Space_T.h
@@ -16,15 +16,15 @@
 #define ACE_LOCAL_NAME_SPACE_T_H
 #include "ace/pre.h"
 
-#include "ace/Name_Space.h"
+#include "ace/Other/Name_Space.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Naming_Context.h"
-#include "ace/SString.h"
-#include "ace/Local_Name_Space.h"
+#include "ace/Other/Naming_Context.h"
+#include "ace/Utils/SString.h"
+#include "ace/Other/Local_Name_Space.h"
 
 // A short-hand name for our set of name/value/type tuples passed back
 // to callers.
@@ -32,12 +32,12 @@ typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
 
 // Simplify later usage by defining typedefs.
 #if (1)
-#include "ace/Hash_Map_Manager.h"
+#include "ace/Utils/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"
+#include "ace/Utils/Templates/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;
@@ -255,7 +255,7 @@ private:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Local_Name_Space_T.cpp"
+#include "ace/Other/Local_Name_Space_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Other/Name_Proxy.cpp b/ace/Other/Name_Proxy.cpp
index cccd599912c..64a6dea67cb 100644
--- a/ace/Other/Name_Proxy.cpp
+++ b/ace/Other/Name_Proxy.cpp
@@ -1,11 +1,15 @@
 // Name_Proxy.cpp
 // $Id$
 
-#include "ace/Name_Proxy.h"
-#include "ace/Log_Msg.h"
+#include "ace/Other/Name_Proxy.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 ACE_RCSID(ace, Name_Proxy, "$Id$")
 
+#ifdef ACE_SUBSET_0
 void
 ACE_Name_Proxy::dump (void) const
 {
@@ -17,6 +21,7 @@ ACE_Name_Proxy::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("reactor_ = %x"), this->reactor_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 // Default constructor.
 
diff --git a/ace/Other/Name_Proxy.h b/ace/Other/Name_Proxy.h
index 234f7b93c49..be8b8ca1ba9 100644
--- a/ace/Other/Name_Proxy.h
+++ b/ace/Other/Name_Proxy.h
@@ -21,17 +21,17 @@
 #define ACE_NAME_PROXY_H
 #include "ace/pre.h"
 
-#include "ace/INET_Addr.h"
+#include "ace/IPC/INET_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Service_Config.h"
-#include "ace/Synch_Options.h"
-#include "ace/Name_Request_Reply.h"
+#include "ace/Sockets/SOCK_Connector.h"
+#include "ace/Sockets/SOCK_Stream.h"
+#include "ace/Svcconf/Service_Config.h"
+#include "ace/Threads/Synch_Options.h"
+#include "ace/Other/Name_Request_Reply.h"
 
 /**
  * @class ACE_Name_Proxy
diff --git a/ace/Other/Name_Request_Reply.cpp b/ace/Other/Name_Request_Reply.cpp
index 032e4771a63..893de794972 100644
--- a/ace/Other/Name_Request_Reply.cpp
+++ b/ace/Other/Name_Request_Reply.cpp
@@ -1,7 +1,10 @@
 // $Id$
 
-#include "ace/Name_Request_Reply.h"
-#include "ace/Log_Msg.h"
+#include "ace/Other/Name_Request_Reply.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 ACE_RCSID(ace, Name_Request_Reply, "$Id$")
 
diff --git a/ace/Other/Name_Request_Reply.h b/ace/Other/Name_Request_Reply.h
index 43dd8609187..6a4058e366b 100644
--- a/ace/Other/Name_Request_Reply.h
+++ b/ace/Other/Name_Request_Reply.h
@@ -21,13 +21,13 @@
 #define ACE_NAME_REQUEST_REPLY_H
 #include "ace/pre.h"
 
-#include "ace/Time_Value.h"
+#include "ace/Timer/Time_Value.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
+#include "ace/Utils/SString.h"
 
 /**
  * @class ACE_Name_Request
diff --git a/ace/Other/Name_Space.cpp b/ace/Other/Name_Space.cpp
index 363790eac5a..c23a953a624 100644
--- a/ace/Other/Name_Space.cpp
+++ b/ace/Other/Name_Space.cpp
@@ -1,7 +1,7 @@
 // Name_Space.cpp
 // $Id$
 
-#include "ace/Name_Space.h"
+#include "ace/Other/Name_Space.h"
 
 ACE_RCSID(ace, Name_Space, "$Id$")
 
diff --git a/ace/Other/Name_Space.h b/ace/Other/Name_Space.h
index d4e461750a8..b18892a6e76 100644
--- a/ace/Other/Name_Space.h
+++ b/ace/Other/Name_Space.h
@@ -21,9 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
-#include "ace/Unbounded_Set.h"
-#include "ace/Name_Proxy.h"
+#include "ace/Utils/SString.h"
+#include "ace/Utils/Unbounded_Set.h"
+#include "ace/Other/Name_Proxy.h"
 
 typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
 
diff --git a/ace/Other/Naming_Context.cpp b/ace/Other/Naming_Context.cpp
index ccfe614ea8b..955c6e3159e 100644
--- a/ace/Other/Naming_Context.cpp
+++ b/ace/Other/Naming_Context.cpp
@@ -1,12 +1,13 @@
 // $Id$
 
-#include "ace/Get_Opt.h"
-#include "ace/Naming_Context.h"
-#include "ace/Remote_Name_Space.h"
-#include "ace/Local_Name_Space_T.h"
-#include "ace/Registry_Name_Space.h"
-#include "ace/Memory_Pool.h"
-#include "ace/RW_Process_Mutex.h"
+#include "ace/Utils/Get_Opt.h"
+#include "ace/Other/Naming_Context.h"
+#include "ace/Other/Remote_Name_Space.h"
+#include "ace/Other/Local_Name_Space_T.h"
+#include "ace/Other/Registry_Name_Space.h"
+#include "ace/Memory/Memory_Pool.h"
+#include "ace/Threads/RW_Process_Mutex.h"
+#include "ace/Logging/Trace.h"
 
 ACE_RCSID(ace, Naming_Context, "$Id$")
 
diff --git a/ace/Other/Naming_Context.h b/ace/Other/Naming_Context.h
index 605eb7e8e9e..784d08ffeff 100644
--- a/ace/Other/Naming_Context.h
+++ b/ace/Other/Naming_Context.h
@@ -22,11 +22,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
-#include "ace/Containers.h"
-#include "ace/Service_Object.h"
-#include "ace/Name_Proxy.h"
-#include "ace/Name_Space.h"
+#include "ace/Utils/SString.h"
+#include "ace/Utils/Containers.h"
+#include "ace/Svcconf/Service_Object.h"
+#include "ace/Other/Name_Proxy.h"
+#include "ace/Other/Name_Space.h"
 
 // Forward decl
 class ACE_Name_Options;
diff --git a/ace/Other/Registry_Name_Space.cpp b/ace/Other/Registry_Name_Space.cpp
index 276f875657b..58a7b2d77ac 100644
--- a/ace/Other/Registry_Name_Space.cpp
+++ b/ace/Other/Registry_Name_Space.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/Registry_Name_Space.h"
+#include "ace/Other/Registry_Name_Space.h"
 
 ACE_RCSID(ace, Registry_Name_Space, "$Id$")
 
diff --git a/ace/Other/Registry_Name_Space.h b/ace/Other/Registry_Name_Space.h
index 075c2643f56..a2510531684 100644
--- a/ace/Other/Registry_Name_Space.h
+++ b/ace/Other/Registry_Name_Space.h
@@ -15,7 +15,7 @@
 #define ACE_REGISTRY_NAME_SPACE_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,9 +24,9 @@
 #if (defined (ACE_WIN32) && defined (UNICODE))
 // This only works on Win32 platforms when UNICODE is turned on
 
-#include "ace/Registry.h"
-#include "ace/Naming_Context.h"
-#include "ace/Name_Space.h"
+#include "ace/Other/Registry.h"
+#include "ace/Other/Naming_Context.h"
+#include "ace/Other/Name_Space.h"
 
 /**
  * @class ACE_Registry_Name_Space
diff --git a/ace/Other/Remote_Name_Space.cpp b/ace/Other/Remote_Name_Space.cpp
index bc906f917a5..352eb41c992 100644
--- a/ace/Other/Remote_Name_Space.cpp
+++ b/ace/Other/Remote_Name_Space.cpp
@@ -1,9 +1,12 @@
 // Remote_Name_Space.cpp
 // $Id$
 
-#include "ace/Remote_Name_Space.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Other/Remote_Name_Space.h"
+#include "ace/Utils/Templates/Auto_Ptr.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 ACE_RCSID(ace, Remote_Name_Space, "$Id$")
 
diff --git a/ace/Other/Remote_Name_Space.h b/ace/Other/Remote_Name_Space.h
index 968278a74c5..e5435998879 100644
--- a/ace/Other/Remote_Name_Space.h
+++ b/ace/Other/Remote_Name_Space.h
@@ -21,9 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
-#include "ace/Name_Proxy.h"
-#include "ace/Name_Space.h"
+#include "ace/Utils/SString.h"
+#include "ace/Other/Name_Proxy.h"
+#include "ace/Other/Name_Space.h"
 
 typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
 
diff --git a/ace/Other/XtReactor.cpp b/ace/Other/XtReactor.cpp
index 9b86329eb0e..bacbb25e5ba 100644
--- a/ace/Other/XtReactor.cpp
+++ b/ace/Other/XtReactor.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ace/Synch_T.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/XtReactor.h"
+#include "ace/Threads/Synch_T.h"
+#include "ace/Sockets/SOCK_Acceptor.h"
+#include "ace/Sockets/SOCK_Connector.h"
+#include "ace/Other/XtReactor.h"
 
 ACE_RCSID(ace, XtReactor, "$Id$")
 
diff --git a/ace/Other/XtReactor.h b/ace/Other/XtReactor.h
index 0104e946952..070aec89d87 100644
--- a/ace/Other/XtReactor.h
+++ b/ace/Other/XtReactor.h
@@ -17,7 +17,7 @@
 #define ACE_XTREACTOR_H
 #include "ace/pre.h"
 
-#include "ace/Select_Reactor.h"
+#include "ace/Demux/Select_Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once