summaryrefslogtreecommitdiff
path: root/ACE/apps/JAWS3/jaws3
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/apps/JAWS3/jaws3')
-rw-r--r--ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h4
-rw-r--r--ACE/apps/JAWS3/jaws3/Config_File.cpp5
-rw-r--r--ACE/apps/JAWS3/jaws3/Datagram.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Options.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Signal_Task.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Symbol_Table.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Symbol_Table.h2
7 files changed, 11 insertions, 8 deletions
diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
index 67082e2bad6..30f39013db8 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/Synch.h"
-#include "ace/Malloc.h"
#include "ace/Free_List.h"
+#include "ace/Malloc.h"
+#include "ace/Synch_Traits.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 ff2fa889489..9bff39efe2a 100644
--- a/ACE/apps/JAWS3/jaws3/Config_File.cpp
+++ b/ACE/apps/JAWS3/jaws3/Config_File.cpp
@@ -1,8 +1,9 @@
-#include "ace/OS_NS_stdlib.h"
-#include "ace/OS_NS_string.h"
#include "ace/FILE_Connector.h"
#include "ace/Message_Block.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_string.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 244c1a35f79..dda46d5a418 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 3f9d847475b..f419ecd4813 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.h"
+#include "ace/Synch_Traits.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 242db3f9f8a..5cb83a14c06 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 7c187498c3d..936d5eaf554 100644
--- a/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
+++ b/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
@@ -2,6 +2,8 @@
#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 346509e57f3..0b1ff507926 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.h"
+#include "ace/Synch_Traits.h"
#include "jaws3/Export.h"