diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-05-16 07:42:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-05-16 07:42:15 +0000 |
| commit | 7bb2bb4b348896baeda77ed129e232740ef63642 (patch) | |
| tree | fd3d7477e817257907613be5ef9c6e005b858314 | |
| parent | 457f880cfab40ee26e620846207dbef7b750a1af (diff) | |
| download | ATCD-7bb2bb4b348896baeda77ed129e232740ef63642.tar.gz | |
Fri May 16 07:41:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/examples/APG/Streams/Answerer.cpp | 2 | ||||
| -rw-r--r-- | ACE/examples/APG/Streams/EndTask.h | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index eaeb3895319..bb64e720d6c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Fri May 16 07:41:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/APG/Streams/Answerer.cpp: + * examples/APG/Streams/EndTask.h: + Replaced EndTask with TheEndTask to resolve a name conflict + when using MinGW + Fri May 16 07:18:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_linux.GNU: diff --git a/ACE/examples/APG/Streams/Answerer.cpp b/ACE/examples/APG/Streams/Answerer.cpp index fb461a8e3ff..f760490efad 100644 --- a/ACE/examples/APG/Streams/Answerer.cpp +++ b/ACE/examples/APG/Streams/Answerer.cpp @@ -243,7 +243,7 @@ public: //FUZZ: enable check_for_lack_ACE_OS if (tail == 0) ACE_NEW_RETURN (tail, - Module (ACE_TEXT ("End Module"), new EndTask ()), + Module (ACE_TEXT ("End Module"), new TheEndTask ()), -1); this->inherited::open (arg, head, tail); // Listing 1000 diff --git a/ACE/examples/APG/Streams/EndTask.h b/ACE/examples/APG/Streams/EndTask.h index a42eca655d9..6d63818fd86 100644 --- a/ACE/examples/APG/Streams/EndTask.h +++ b/ACE/examples/APG/Streams/EndTask.h @@ -5,7 +5,7 @@ #define END_TASK_H // Listing 1 code/ch18 -class EndTask : public BasicTask { +class TheEndTask : public BasicTask { protected: virtual int process (Message *) { @@ -16,7 +16,7 @@ protected: virtual int next_step (ACE_Message_Block *mb) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("EndTask::next_step() - ") + ACE_TEXT ("TheEndTask::next_step() - ") ACE_TEXT ("end of the line.\n"))); mb->release (); return 0; |