diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-22 07:26:32 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-22 07:26:32 +0000 |
commit | bbf1e50b12a80bc5c3b612b36f2ea0c567282145 (patch) | |
tree | 05f0e03d7e51503c9e3064fe7e28e933312c10f3 | |
parent | 75ddd76dbad5ffc200c8e4227d9d829af4afca9f (diff) | |
download | ATCD-bbf1e50b12a80bc5c3b612b36f2ea0c567282145.tar.gz |
Fri May 22 07:26:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* apps/JAWS2/JAWS/IO.cpp
* apps/JAWS2/JAWS/IO.h
* apps/JAWS2/JAWS/Jaws_IO.cpp
* apps/JAWS2/JAWS/Jaws_IO.h
Renamed to Jaws_IO to fix problems on windows
* apps/JAWS2/JAWS/Concurrency.h
* apps/JAWS2/JAWS/IO_Acceptor.h
* apps/JAWS2/JAWS/IO_Handler.cpp
* apps/JAWS2/JAWS/jaws2.mpc
* apps/JAWS2/JAWS/Makefile.am
* apps/JAWS2/JAWS/Pipeline_Tasks.cpp
* apps/JAWS2/JAWS/Server.cpp
Updated includes and filenames
-rw-r--r-- | ACE/ChangeLog | 17 | ||||
-rw-r--r-- | ACE/apps/JAWS2/JAWS/Concurrency.h | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS2/JAWS/IO_Acceptor.h | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS2/JAWS/IO_Handler.cpp | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS2/JAWS/Jaws_IO.cpp (renamed from ACE/apps/JAWS2/JAWS/IO.cpp) | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS2/JAWS/Jaws_IO.h (renamed from ACE/apps/JAWS2/JAWS/IO.h) | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS2/JAWS/Makefile.am | 4 | ||||
-rw-r--r-- | ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS2/JAWS/Server.cpp | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS2/JAWS/jaws2.mpc | 2 |
10 files changed, 26 insertions, 11 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index d550ce682fb..5341cbe2bf6 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,20 @@ +Fri May 22 07:26:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * apps/JAWS2/JAWS/IO.cpp + * apps/JAWS2/JAWS/IO.h + * apps/JAWS2/JAWS/Jaws_IO.cpp + * apps/JAWS2/JAWS/Jaws_IO.h + Renamed to Jaws_IO to fix problems on windows + + * apps/JAWS2/JAWS/Concurrency.h + * apps/JAWS2/JAWS/IO_Acceptor.h + * apps/JAWS2/JAWS/IO_Handler.cpp + * apps/JAWS2/JAWS/jaws2.mpc + * apps/JAWS2/JAWS/Makefile.am + * apps/JAWS2/JAWS/Pipeline_Tasks.cpp + * apps/JAWS2/JAWS/Server.cpp + Updated includes and filenames + Wed May 20 12:13:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> * bin/PerlACE/ProcessVX.pm: diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.h b/ACE/apps/JAWS2/JAWS/Concurrency.h index c88d75c4dbe..6f65c5017bd 100644 --- a/ACE/apps/JAWS2/JAWS/Concurrency.h +++ b/ACE/apps/JAWS2/JAWS/Concurrency.h @@ -14,7 +14,7 @@ #include "ace/Synch_Traits.h" #include "JAWS/Export.h" -#include "JAWS/IO.h" +#include "JAWS/Jaws_IO.h" class JAWS_Data_Block; class JAWS_Dispatch_Policy; diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h index 3f97f876d0b..e14a38a2714 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h +++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h @@ -17,7 +17,7 @@ #include "ace/Singleton.h" #include "JAWS/Export.h" -#include "JAWS/IO.h" +#include "JAWS/Jaws_IO.h" #include "JAWS/IO_Handler.h" // Forward declaration. diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp index 82f9753a41d..9d052348b01 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_socket.h" -#include "JAWS/IO.h" +#include "JAWS/Jaws_IO.h" #include "JAWS/IO_Handler.h" #include "JAWS/IO_Acceptor.h" #include "JAWS/Data_Block.h" diff --git a/ACE/apps/JAWS2/JAWS/IO.cpp b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp index 41603c6b626..4f0525a6f6d 100644 --- a/ACE/apps/JAWS2/JAWS/IO.cpp +++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp @@ -11,7 +11,7 @@ #include "JAWS/Data_Block.h" #include "JAWS/Policy.h" -#include "JAWS/IO.h" +#include "JAWS/Jaws_IO.h" #include "JAWS/IO_Handler.h" #include "JAWS/IO_Acceptor.h" #include "JAWS/Filecache.h" diff --git a/ACE/apps/JAWS2/JAWS/IO.h b/ACE/apps/JAWS2/JAWS/Jaws_IO.h index e336487bd86..188a5b64442 100644 --- a/ACE/apps/JAWS2/JAWS/IO.h +++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.h @@ -38,8 +38,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL class JAWS_IO_Handler; class JAWS_IO_Acceptor; - - class JAWS_Export JAWS_IO // = TITLE // diff --git a/ACE/apps/JAWS2/JAWS/Makefile.am b/ACE/apps/JAWS2/JAWS/Makefile.am index dd00e5870ea..99bd5bce9d0 100644 --- a/ACE/apps/JAWS2/JAWS/Makefile.am +++ b/ACE/apps/JAWS2/JAWS/Makefile.am @@ -34,7 +34,7 @@ libJAWS2_la_SOURCES = \ FILE.cpp \ Filecache.cpp \ Headers.cpp \ - IO.cpp \ + Jaws_IO.cpp \ IO_Acceptor.cpp \ IO_Handler.cpp \ Parse_Headers.cpp \ @@ -65,7 +65,7 @@ noinst_HEADERS = \ Hash_Bucket_T.cpp \ Hash_Bucket_T.h \ Headers.h \ - IO.h \ + Jaws_IO.h \ IO_Acceptor.h \ IO_Handler.h \ Parse_Headers.h \ diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp index 0368acfc6c4..8279d182de7 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "JAWS/IO.h" +#include "JAWS/Jaws_IO.h" #include "JAWS/Pipeline_Tasks.h" #include "JAWS/Pipeline_Handler_T.h" #include "JAWS/Data_Block.h" diff --git a/ACE/apps/JAWS2/JAWS/Server.cpp b/ACE/apps/JAWS2/JAWS/Server.cpp index aeb3e9cbd7d..24200d9d211 100644 --- a/ACE/apps/JAWS2/JAWS/Server.cpp +++ b/ACE/apps/JAWS2/JAWS/Server.cpp @@ -11,7 +11,7 @@ #include "JAWS/Server.h" #include "JAWS/Data_Block.h" #include "JAWS/Concurrency.h" -#include "JAWS/IO.h" +#include "JAWS/Jaws_IO.h" #include "JAWS/IO_Handler.h" #include "JAWS/IO_Acceptor.h" #include "JAWS/Pipeline_Tasks.h" diff --git a/ACE/apps/JAWS2/JAWS/jaws2.mpc b/ACE/apps/JAWS2/JAWS/jaws2.mpc index f1fa986cc8c..c371f14c28c 100644 --- a/ACE/apps/JAWS2/JAWS/jaws2.mpc +++ b/ACE/apps/JAWS2/JAWS/jaws2.mpc @@ -21,7 +21,7 @@ project(JAWS2) : ace_output, acelib { FILE.cpp Filecache.cpp Headers.cpp - IO.cpp + Jaws_IO.cpp IO_Acceptor.cpp IO_Handler.cpp Parse_Headers.cpp |