diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | examples/ASX/Event_Server/Event_Server/event_server.cpp | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f4dd6cb838a..dbf5725840b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Dec 6 21:34:03 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * examples/ASX/Event_Server/Event_Server/event_server.cpp: + + Removed duplicate "MT_Stream" typedef that made the same typedef + in `ace/UPIPE_Stream.h' ambiguous. Fixes a versioned namespace + build error. + Tue Dec 6 18:40:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/config/acedefaults.mpb: diff --git a/examples/ASX/Event_Server/Event_Server/event_server.cpp b/examples/ASX/Event_Server/Event_Server/event_server.cpp index 6546e6afc13..c691c1384ae 100644 --- a/examples/ASX/Event_Server/Event_Server/event_server.cpp +++ b/examples/ASX/Event_Server/Event_Server/event_server.cpp @@ -17,7 +17,6 @@ ACE_RCSID (Event_Server, "$Id$") // Typedef these components to handle multi-threading correctly. -typedef ACE_VERSIONED_NAMESPACE_NAME::ACE_Stream<ACE_SYNCH> MT_Stream; typedef ACE_Module<ACE_SYNCH> MT_Module; |