diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-22 10:52:11 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-22 10:52:11 +0000 |
commit | 6b1c4a7e6c04415e4086133c8e1ac2cf771b8a1c (patch) | |
tree | 076bc9ae2b68c74d59f0c2932a4bde3b5da9a804 | |
parent | 816aa1df8420efc6d45cf288ff36f55c955ca484 (diff) | |
download | ATCD-6b1c4a7e6c04415e4086133c8e1ac2cf771b8a1c.tar.gz |
Fri May 22 10:51:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* apps/JAWS3/jaws3/IO.cpp
* apps/JAWS3/jaws3/IO.h
* apps/JAWS3/jaws3/Jaws_IO.cpp
* apps/JAWS3/jaws3/Jaws_IO.h
Renamed to Jaws_IO to fix problems on windows
* apps/JAWS3/jaws3/Asynch_IO.cpp
* apps/JAWS3/jaws3/Asynch_IO.h
* apps/JAWS3/jaws3/Asynch_IO_Helpers.h
* apps/JAWS3/jaws3/jaws3.mpc
* apps/JAWS3/jaws3/Makefile.am
* apps/JAWS3/jaws3/Reactive_IO.cpp
* apps/JAWS3/jaws3/Reactive_IO.h
* apps/JAWS3/jaws3/Reactive_IO_Helpers.h
* apps/JAWS3/jaws3/Synch_IO.cpp
* apps/JAWS3/jaws3/Synch_IO.h
* apps/JAWS3/jaws3/Templates.cpp
Updated includes and filenames
-rw-r--r-- | ACE/ChangeLog | 21 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Asynch_IO.cpp | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Asynch_IO.h | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Jaws_IO.cpp (renamed from ACE/apps/JAWS3/jaws3/IO.cpp) | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Jaws_IO.h (renamed from ACE/apps/JAWS3/jaws3/IO.h) | 0 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Makefile.am | 4 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Reactive_IO.cpp | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Reactive_IO.h | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Synch_IO.cpp | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Synch_IO.h | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/Templates.cpp | 2 | ||||
-rw-r--r-- | ACE/apps/JAWS3/jaws3/jaws3.mpc | 4 |
14 files changed, 35 insertions, 14 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 48cf43f4df9..82f21254a63 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,24 @@ +Fri May 22 10:51:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * apps/JAWS3/jaws3/IO.cpp + * apps/JAWS3/jaws3/IO.h + * apps/JAWS3/jaws3/Jaws_IO.cpp + * apps/JAWS3/jaws3/Jaws_IO.h + Renamed to Jaws_IO to fix problems on windows + + * apps/JAWS3/jaws3/Asynch_IO.cpp + * apps/JAWS3/jaws3/Asynch_IO.h + * apps/JAWS3/jaws3/Asynch_IO_Helpers.h + * apps/JAWS3/jaws3/jaws3.mpc + * apps/JAWS3/jaws3/Makefile.am + * apps/JAWS3/jaws3/Reactive_IO.cpp + * apps/JAWS3/jaws3/Reactive_IO.h + * apps/JAWS3/jaws3/Reactive_IO_Helpers.h + * apps/JAWS3/jaws3/Synch_IO.cpp + * apps/JAWS3/jaws3/Synch_IO.h + * apps/JAWS3/jaws3/Templates.cpp + Updated includes and filenames + Fri May 22 08:31:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Module.h: diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp index 54b4f1c012d..298f5b02274 100644 --- a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp +++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp @@ -6,7 +6,7 @@ #include "ace/config-lite.h" -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" #include "jaws3/Asynch_IO.h" #include "jaws3/Event_Completer.h" #include "jaws3/Event_Result.h" diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.h b/ACE/apps/JAWS3/jaws3/Asynch_IO.h index 68fd257cb24..f2b7cb81cb7 100644 --- a/ACE/apps/JAWS3/jaws3/Asynch_IO.h +++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.h @@ -10,7 +10,7 @@ #include "ace/Time_Value.h" #include "jaws3/Export.h" -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" #include "jaws3/Event_Result.h" class JAWS_Asynch_IO; diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h index e82ab8189e5..21c65e73339 100644 --- a/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h @@ -7,7 +7,7 @@ #include "ace/Asynch_IO.h" #include "ace/Singleton.h" -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" #include "jaws3/Event_Result.h" #include "jaws3/Event_Completer.h" diff --git a/ACE/apps/JAWS3/jaws3/IO.cpp b/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp index 98e2e6e32f5..f4187cbb806 100644 --- a/ACE/apps/JAWS3/jaws3/IO.cpp +++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_strings.h" -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" #include "jaws3/Asynch_IO.h" #include "jaws3/Synch_IO.h" #include "jaws3/Reactive_IO.h" diff --git a/ACE/apps/JAWS3/jaws3/IO.h b/ACE/apps/JAWS3/jaws3/Jaws_IO.h index a910a4fb029..a910a4fb029 100644 --- a/ACE/apps/JAWS3/jaws3/IO.h +++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.h diff --git a/ACE/apps/JAWS3/jaws3/Makefile.am b/ACE/apps/JAWS3/jaws3/Makefile.am index d140de85b12..96751258f06 100644 --- a/ACE/apps/JAWS3/jaws3/Makefile.am +++ b/ACE/apps/JAWS3/jaws3/Makefile.am @@ -33,7 +33,7 @@ libJAWS3_la_SOURCES = \ Event_Completer.cpp \ Event_Dispatcher.cpp \ FILE.cpp \ - IO.cpp \ + Jaws_IO.cpp \ Options.cpp \ Protocol_Handler.cpp \ Reactive_IO.cpp \ @@ -63,7 +63,7 @@ noinst_HEADERS = \ Event_Result.h \ Export.h \ FILE.h \ - IO.h \ + Jaws_IO.h \ Options.h \ Protocol_Handler.h \ Reactive_IO.h \ diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp index ead383efa24..d2e16ff8b11 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp @@ -8,7 +8,7 @@ #define JAWS_BUILD_DLL #endif -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" #include "jaws3/Reactive_IO.h" #include "jaws3/Reactive_IO_Helpers.h" #include "jaws3/Event_Completer.h" diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.h b/ACE/apps/JAWS3/jaws3/Reactive_IO.h index e899357e5fc..1efc0f86cc5 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO.h +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.h @@ -10,7 +10,7 @@ #include "ace/Time_Value.h" #include "jaws3/Export.h" -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" #include "jaws3/Event_Result.h" class JAWS_Reactive_IO; diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h index 9f94fd4caaf..d14f6c33998 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h @@ -10,7 +10,7 @@ #include "ace/Time_Value.h" #include "jaws3/Export.h" -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" #include "jaws3/Event_Result.h" #include "jaws3/Event_Completer.h" diff --git a/ACE/apps/JAWS3/jaws3/Synch_IO.cpp b/ACE/apps/JAWS3/jaws3/Synch_IO.cpp index 69b0d92fd95..1f66363d8ea 100644 --- a/ACE/apps/JAWS3/jaws3/Synch_IO.cpp +++ b/ACE/apps/JAWS3/jaws3/Synch_IO.cpp @@ -6,7 +6,7 @@ #define JAWS_BUILD_DLL #endif -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" #include "jaws3/Synch_IO.h" #include "jaws3/Event_Completer.h" diff --git a/ACE/apps/JAWS3/jaws3/Synch_IO.h b/ACE/apps/JAWS3/jaws3/Synch_IO.h index 5ecf5267088..79c8a936a2e 100644 --- a/ACE/apps/JAWS3/jaws3/Synch_IO.h +++ b/ACE/apps/JAWS3/jaws3/Synch_IO.h @@ -6,7 +6,7 @@ #include "ace/Singleton.h" -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" class JAWS_Export JAWS_Synch_IO : public JAWS_IO_Impl { diff --git a/ACE/apps/JAWS3/jaws3/Templates.cpp b/ACE/apps/JAWS3/jaws3/Templates.cpp index c28a9019318..2f702936747 100644 --- a/ACE/apps/JAWS3/jaws3/Templates.cpp +++ b/ACE/apps/JAWS3/jaws3/Templates.cpp @@ -13,7 +13,7 @@ #include "jaws3/Asynch_IO.h" #include "jaws3/Concurrency.h" #include "jaws3/Export.h" -#include "jaws3/IO.h" +#include "jaws3/Jaws_IO.h" #include "jaws3/Event_Dispatcher.h" #include "jaws3/Event_Completer.h" #include "jaws3/Options.h" diff --git a/ACE/apps/JAWS3/jaws3/jaws3.mpc b/ACE/apps/JAWS3/jaws3/jaws3.mpc index 850c50b09c3..e8ba773a578 100644 --- a/ACE/apps/JAWS3/jaws3/jaws3.mpc +++ b/ACE/apps/JAWS3/jaws3/jaws3.mpc @@ -21,7 +21,7 @@ project(JAWS3) : ace_output, acelib { Event_Completer.cpp Event_Dispatcher.cpp FILE.cpp - IO.cpp + Jaws_IO.cpp Options.cpp Protocol_Handler.cpp Reactive_IO.cpp @@ -55,7 +55,7 @@ project(JAWS3) : ace_output, acelib { Event_Result.h Export.h FILE.h - IO.h + Jaws_IO.h Options.h Protocol_Handler.h Reactive_IO.h |