Finished Streams sub-directory

14 files changed, 41 insertions, 36 deletions

diff --git a/ace/Streams/CDR_Base.cpp b/ace/Streams/CDR_Base.cpp
index f505822303f..9d3b6f86ef8 100644
--- a/ace/Streams/CDR_Base.cpp
+++ b/ace/Streams/CDR_Base.cpp
@@ -2,11 +2,11 @@
 //
 // $Id$
 
-#include "ace/CDR_Base.h"
-#include "ace/Message_Block.h"
+#include "ace/Streams/CDR_Base.h"
+#include "ace/Utils/Message_Block.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/CDR_Base.inl"
+# include "ace/Streams/CDR_Base.inl"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID(ace, CDR_Base, "$Id$")
diff --git a/ace/Streams/CDR_Base.h b/ace/Streams/CDR_Base.h
index 884fd196e25..50f8ebf3137 100644
--- a/ace/Streams/CDR_Base.h
+++ b/ace/Streams/CDR_Base.h
@@ -36,8 +36,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE	*/
 
-#include "ace/Basic_Types.h"
-#include "ace/Message_Block.h"
+#include "ace/OS/Basic_Types.h"
+#include "ace/Utils/Message_Block.h"
 
 /**
  * @class ACE_CDR
@@ -282,7 +282,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-# include "ace/CDR_Base.inl"
+# include "ace/Streams/CDR_Base.inl"
 #endif	/* __ACE_INLINE__ */
 
 
diff --git a/ace/Streams/CDR_Stream.cpp b/ace/Streams/CDR_Stream.cpp
index cab64652ea7..f0b5b75564a 100644
--- a/ace/Streams/CDR_Stream.cpp
+++ b/ace/Streams/CDR_Stream.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "ace/CDR_Stream.h"
-#include "ace/SString.h"
+#include "ace/Streams/CDR_Stream.h"
+#include "ace/Utils/SString.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/CDR_Stream.i"
+# include "ace/Streams/CDR_Stream.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID(ace, CDR_Stream, "$Id$")
diff --git a/ace/Streams/CDR_Stream.h b/ace/Streams/CDR_Stream.h
index 8b1ac7e9c0f..75289f66c24 100644
--- a/ace/Streams/CDR_Stream.h
+++ b/ace/Streams/CDR_Stream.h
@@ -35,14 +35,14 @@
 
 #include "ace/pre.h"
 
-#include "ace/CDR_Base.h"
+#include "ace/Streams/CDR_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
-#include "ace/Message_Block.h"
+#include "ace/Utils/SString.h"
+#include "ace/Utils/Message_Block.h"
 
 class ACE_Char_Codeset_Translator;
 class ACE_WChar_Codeset_Translator;
@@ -1047,7 +1047,7 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
 
 
 #if defined (__ACE_INLINE__)
-# include "ace/CDR_Stream.i"
+# include "ace/Streams/CDR_Stream.i"
 #else /* __ACE_INLINE__ */
 
 // Not used by CORBA or TAO
diff --git a/ace/Streams/Codeset_IBM1047.cpp b/ace/Streams/Codeset_IBM1047.cpp
index 45ae7932665..a6adef23c20 100644
--- a/ace/Streams/Codeset_IBM1047.cpp
+++ b/ace/Streams/Codeset_IBM1047.cpp
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#include "ace/Codeset_IBM1047.h"
+#include "ace/Streams/Codeset_IBM1047.h"
 
 #if defined(ACE_MVS)
 
diff --git a/ace/Streams/Codeset_IBM1047.h b/ace/Streams/Codeset_IBM1047.h
index 575b3d2f2e9..e44ca95a6a6 100644
--- a/ace/Streams/Codeset_IBM1047.h
+++ b/ace/Streams/Codeset_IBM1047.h
@@ -27,7 +27,7 @@
 
 #if defined(ACE_MVS)
 
-#include "ace/CDR_Stream.h"
+#include "ace/Streams/CDR_Stream.h"
 
 extern ACE_Export char ACE_to_IBM1047[257];
 extern ACE_Export char ACE_from_IBM1047[257];
diff --git a/ace/Streams/Read_Buffer.cpp b/ace/Streams/Read_Buffer.cpp
index 2b88461446e..85f467cfc23 100644
--- a/ace/Streams/Read_Buffer.cpp
+++ b/ace/Streams/Read_Buffer.cpp
@@ -1,14 +1,15 @@
 // $Id$
 
-#include "ace/Read_Buffer.h"
-#include "ace/Service_Config.h"
+#include "ace/Streams/Read_Buffer.h"
+#include "ace/Svcconf/Service_Config.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Read_Buffer.i"
+#include "ace/Streams/Read_Buffer.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Read_Buffer, "$Id$")
 
+#ifdef ACE_SUBSET_0
 void
 ACE_Read_Buffer::dump (void) const
 {
@@ -20,6 +21,7 @@ ACE_Read_Buffer::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nallocator_ = %x"), this->allocator_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp,
                                   int close_on_delete,
diff --git a/ace/Streams/Read_Buffer.h b/ace/Streams/Read_Buffer.h
index ad1bef9fa32..df2ba26c30f 100644
--- a/ace/Streams/Read_Buffer.h
+++ b/ace/Streams/Read_Buffer.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Malloc.h"
+#include "ace/Memory/Malloc.h"
 
 /**
  * @class ACE_Read_Buffer
@@ -107,7 +107,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-# include "ace/Read_Buffer.i"
+# include "ace/Streams/Read_Buffer.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Streams/Task.cpp b/ace/Streams/Task.cpp
index b073c27eaed..c002df58d08 100644
--- a/ace/Streams/Task.cpp
+++ b/ace/Streams/Task.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "ace/Task.h"
-#include "ace/Module.h"
+#include "ace/Streams/Task.h"
+#include "ace/Streams/Module.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Task.i"
+#include "ace/Streams/Task.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Task, "$Id$")
diff --git a/ace/Streams/Typed_SV_Message.cpp b/ace/Streams/Typed_SV_Message.cpp
index 6b4ae9024b0..d0d7e0fb943 100644
--- a/ace/Streams/Typed_SV_Message.cpp
+++ b/ace/Streams/Typed_SV_Message.cpp
@@ -3,14 +3,14 @@
 
 #ifndef ACE_TYPED_SV_MESSAGE_C
 #define ACE_TYPED_SV_MESSAGE_C
-#include "ace/Typed_SV_Message.h"
+#include "ace/Streams/Typed_SV_Message.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Typed_SV_Message.i"
+#include "ace/Streams/Typed_SV_Message.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Typed_SV_Message, "$Id$")
diff --git a/ace/Streams/Typed_SV_Message.h b/ace/Streams/Typed_SV_Message.h
index 36c5137b80e..a516b861db7 100644
--- a/ace/Streams/Typed_SV_Message.h
+++ b/ace/Streams/Typed_SV_Message.h
@@ -79,11 +79,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Typed_SV_Message.i"
+#include "ace/Streams/Typed_SV_Message.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Typed_SV_Message.cpp"
+#include "ace/Streams/Typed_SV_Message.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Streams/Typed_SV_Message_Queue.cpp b/ace/Streams/Typed_SV_Message_Queue.cpp
index 1a0a3b99943..ded6a74d63b 100644
--- a/ace/Streams/Typed_SV_Message_Queue.cpp
+++ b/ace/Streams/Typed_SV_Message_Queue.cpp
@@ -4,17 +4,20 @@
 #ifndef ACE_TYPED_SV_MESSAGE_QUEUE_C
 #define ACE_TYPED_SV_MESSAGE_QUEUE_C
 
-#include "ace/Typed_SV_Message.h"
+#include "ace/Streams/Typed_SV_Message.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Typed_SV_Message_Queue.h"
-#include "ace/Log_Msg.h"
+#include "ace/Streams/Typed_SV_Message_Queue.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Typed_SV_Message_Queue.i"
+#include "ace/Streams/Typed_SV_Message_Queue.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Typed_SV_Message_Queue, "$Id$")
diff --git a/ace/Streams/Typed_SV_Message_Queue.h b/ace/Streams/Typed_SV_Message_Queue.h
index 20d2ec690c2..c67fb06e6fb 100644
--- a/ace/Streams/Typed_SV_Message_Queue.h
+++ b/ace/Streams/Typed_SV_Message_Queue.h
@@ -14,13 +14,13 @@
 #define ACE_TYPED_MESSAGE_QUEUE_H
 #include "ace/pre.h"
 
-#include "ace/SV_Message_Queue.h"
+#include "ace/IPC/SV_Message_Queue.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Typed_SV_Message.h"
+#include "ace/Streams/Typed_SV_Message.h"
 
 /**
  * @class ACE_Typed_SV_Message_Queue
@@ -71,11 +71,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Typed_SV_Message_Queue.i"
+#include "ace/Streams/Typed_SV_Message_Queue.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Typed_SV_Message_Queue.cpp"
+#include "ace/Streams/Typed_SV_Message_Queue.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Streams/Typed_SV_Message_Queue.i b/ace/Streams/Typed_SV_Message_Queue.i
index afbea9c455d..84533f522f6 100644
--- a/ace/Streams/Typed_SV_Message_Queue.i
+++ b/ace/Streams/Typed_SV_Message_Queue.i
@@ -3,7 +3,7 @@
 
 // Typed_SV_Message_Queue.i
 
-#include "ace/SV_Message_Queue.h"
+#include "ace/IPC/SV_Message_Queue.h"
 
 template <class T> ACE_INLINE int 
 ACE_Typed_SV_Message_Queue<T>::open (key_t external_id,