diff options
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/examples/Advanced/ch_3/client.cpp | 5 | ||||
| -rw-r--r-- | TAO/examples/Advanced/ch_3/server.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp | 21 | ||||
| -rw-r--r-- | TAO/tests/Bug_1639_Regression/struct_client.cpp | 4 |
5 files changed, 30 insertions, 15 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4ecf50318c7..01ed08ecae6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Sep 13 11:43:12 UTC 2005 Martin Corino <mcorino@remedy.nl> + + * examples/Advanced/ch_3/client.cpp: + * examples/Advanced/ch_3/server.cpp: + * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp: + * tests/Bug_1639_Regression/struct_client.cpp: + + Fixed for environments defining ACE_USES_OLD_IOSTREAMS + (which unfortunately is the case for Windows x64 at the + moment due to shortcomings in the Platform SDK). + Tue Sep 13 10:30:00 UTC 2005 Simon Massey <sma@prismtech.com> * tao/AnyTypeCode/Any.cpp diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp index d2367089aae..b8e0b3db2e5 100644 --- a/TAO/examples/Advanced/ch_3/client.cpp +++ b/TAO/examples/Advanced/ch_3/client.cpp @@ -20,10 +20,7 @@ // ============================================================================ #include "timeC.h" -#include <iomanip> -#include <iostream> - -using namespace std; +#include <ace/streams.h> // The following header is #included automatically by ACE+TAO. // Therefore, they don't need to be included explicitly. diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp index 4a34a815d35..fb8fbd74601 100644 --- a/TAO/examples/Advanced/ch_3/server.cpp +++ b/TAO/examples/Advanced/ch_3/server.cpp @@ -19,10 +19,8 @@ // // ============================================================================ -#include <iostream> #include "server.h" - -using namespace std; +#include <ace/streams.h> // The following headers are #included automatically by ACE+TAO. // Therefore, they don't need to be included explicitly. diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index 1ec12948079..b8489b6c14a 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -2,8 +2,12 @@ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> // cvs-id : $Id$ -#include <iostream> -#include <sstream> +#include <ace/streams.h> +#if defined(ACE_USES_OLD_IOSTREAMS) +# include <strstrea.h> +#else +# include <sstream> +#endif #include "ace/OS.h" @@ -23,9 +27,6 @@ #include "Gate/Gate.h" -using std::cerr; -using std::endl; - using namespace CORBA; using namespace CosNotifyComm; using namespace CosNotification; @@ -97,10 +98,18 @@ private: // Make a unique "event id" by combining space_craft_name, agent_name, // and counter. This can be handy for debugging. // - std::ostringstream ostr; +#if defined(ACE_USES_OLD_IOSTREAMS) + ostrstream ostr; +#else + ostringstream ostr; +#endif ostr << space_craft_name_ << ":" << agent_name_ << ":" << counter_++; +#if defined(ACE_USES_OLD_IOSTREAMS) + e.header.fixed_header.event_name = ostr.str (); +#else e.header.fixed_header.event_name = ostr.str ().c_str (); +#endif // Also add space_craft_name and agent_name fields separately // into variable_header. This will make filtering easier. diff --git a/TAO/tests/Bug_1639_Regression/struct_client.cpp b/TAO/tests/Bug_1639_Regression/struct_client.cpp index 06ebf90cf9a..16ba27452ea 100644 --- a/TAO/tests/Bug_1639_Regression/struct_client.cpp +++ b/TAO/tests/Bug_1639_Regression/struct_client.cpp @@ -3,11 +3,11 @@ // #include "tao/DynamicAny/DynAnyFactory.h" #include "structC.h" -#include <iostream> +#include <ace/streams.h> using namespace StructTest; using namespace DynamicAny; -using namespace std; + //-------------------------------------------------------------------- int main (int argc, char * argv[]) //-------------------------------------------------------------------- |