Revert "some (bundled) minor changes (take 2)"revert-176-master

9 files changed, 12 insertions, 15 deletions

diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
index cab6cff8e64..c8df6d3eba1 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
@@ -2,10 +2,10 @@
 #ifndef JAWS_HTTP_SERVICE_HANDLER_H
 #define JAWS_HTTP_SERVICE_HANDLER_H
 
+#include "ace/Synch.h"
 #include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
 #include "ace/Svc_Handler.h"
-#include "ace/Synch_Traits.h"
+#include "ace/SOCK_Acceptor.h"
 
 #include "jaws3/Protocol_Handler.h"
 
diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
index 30f39013db8..67082e2bad6 100644
--- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
+++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
@@ -3,9 +3,9 @@
 #define JAWS_CACHED_ALLOCATOR_T_H
 
 #include "ace/ACE.h"
-#include "ace/Free_List.h"
+#include "ace/Synch.h"
 #include "ace/Malloc.h"
-#include "ace/Synch_Traits.h"
+#include "ace/Free_List.h"
 
 #define JAWS_DEFAULT_ALLOCATOR_CHUNKS 10
 #define JAWS_CACHED_ALLOCATOR(T) \
diff --git a/ACE/apps/JAWS3/jaws3/Config_File.cpp b/ACE/apps/JAWS3/jaws3/Config_File.cpp
index 9bff39efe2a..ff2fa889489 100644
--- a/ACE/apps/JAWS3/jaws3/Config_File.cpp
+++ b/ACE/apps/JAWS3/jaws3/Config_File.cpp
@@ -1,9 +1,8 @@
-#include "ace/FILE_Connector.h"
-#include "ace/Message_Block.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
+#include "ace/FILE_Connector.h"
+#include "ace/Message_Block.h"
 #include "ace/Singleton.h"
-#include "ace/Synch.h"
 #include "ace/Unbounded_Queue.h"
 
 #ifndef JAWS_BUILD_DLL
diff --git a/ACE/apps/JAWS3/jaws3/Datagram.h b/ACE/apps/JAWS3/jaws3/Datagram.h
index dda46d5a418..244c1a35f79 100644
--- a/ACE/apps/JAWS3/jaws3/Datagram.h
+++ b/ACE/apps/JAWS3/jaws3/Datagram.h
@@ -3,9 +3,9 @@
 #define JAWS_DATAGRAM_H
 
 #include "ace/Addr.h"
+#include "ace/Synch.h"
 #include "ace/Singleton.h"
 #include "ace/SOCK_Dgram.h"
-#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/Event_Completer.h"
diff --git a/ACE/apps/JAWS3/jaws3/Options.h b/ACE/apps/JAWS3/jaws3/Options.h
index f419ecd4813..3f9d847475b 100644
--- a/ACE/apps/JAWS3/jaws3/Options.h
+++ b/ACE/apps/JAWS3/jaws3/Options.h
@@ -3,7 +3,7 @@
 #define JAWS_OPTIONS_H
 
 #include "ace/Singleton.h"
-#include "ace/Synch_Traits.h"
+#include "ace/Synch.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/Config_File.h"
diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.h b/ACE/apps/JAWS3/jaws3/Signal_Task.h
index 5cb83a14c06..242db3f9f8a 100644
--- a/ACE/apps/JAWS3/jaws3/Signal_Task.h
+++ b/ACE/apps/JAWS3/jaws3/Signal_Task.h
@@ -2,9 +2,9 @@
 #ifndef JAWS_SIGNAL_TASK_H
 #define JAWS_SIGNAL_TASK_H
 
+#include "ace/Synch.h"
 #include "ace/Signal.h"
 #include "ace/Singleton.h"
-#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 
diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp b/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
index 936d5eaf554..7c187498c3d 100644
--- a/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
+++ b/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
@@ -2,8 +2,6 @@
 #define JAWS_BUILD_DLL
 #endif
 
-#include "ace/Synch.h"
-
 #include "jaws3/Symbol_Table.h"
 
 JAWS_Symbol_Table::JAWS_Symbol_Table (size_t size)
diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.h b/ACE/apps/JAWS3/jaws3/Symbol_Table.h
index 0b1ff507926..346509e57f3 100644
--- a/ACE/apps/JAWS3/jaws3/Symbol_Table.h
+++ b/ACE/apps/JAWS3/jaws3/Symbol_Table.h
@@ -3,7 +3,7 @@
 #define JAWS_SYMBOL_TABLE_H
 
 #include "ace/Hash_Map_Manager.h"
-#include "ace/Synch_Traits.h"
+#include "ace/Synch.h"
 
 #include "jaws3/Export.h"
 
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.h b/ACE/apps/JAWS3/small/SS_Service_Handler.h
index f7068f54626..a7e49ba2d8d 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.h
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.h
@@ -2,11 +2,11 @@
 #ifndef TERA_SS_SERVICE_HANDLER_H
 #define TERA_SS_SERVICE_HANDLER_H
 
+#include "ace/Synch.h"
 #include "ace/Acceptor.h"
+#include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/svc_export.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Synch_Traits.h"
 
 #include "jaws3/Protocol_Handler.h"