diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-06-11 12:32:08 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-06-11 12:32:08 +0000 |
| commit | f1f6a56d15f4033ab348e556d63e82a551c029e7 (patch) | |
| tree | 60d1e20b196165f5a11f221e598e5df571d646f3 | |
| parent | 66c1021a7d3a8adff467d47954d137bf565be827 (diff) | |
| download | ATCD-f1f6a56d15f4033ab348e556d63e82a551c029e7.tar.gz | |
ChangeLogTag:Wed Jun 11 07:28:57 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ace/config-lynxos.h | 4 | ||||
| -rw-r--r-- | examples/C++NPv1/Logging_Client.cpp | 7 | ||||
| -rw-r--r-- | examples/C++NPv2/TP_Reactor_Logging_Server.cpp | 5 |
4 files changed, 24 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 18c661710d5..fcbc1531a5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jun 11 07:28:57 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * ace/config-lynxos.h: + * examples/C++NPv1/Logging_Client.cpp: + * examples/C++NPv2/Select_Reactor_Logging_Server.cpp: Applied + patches from Olli Savia <ops@iki.fi> to get the C++NPv examples + compiling on pre-LynxOS 3.0.1 with gcc 2.7-97r1. + Tue Jun 10 12:50:16 2003 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/ProjectCreator.pm: diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h index 85eb9278856..affd7eeb266 100644 --- a/ace/config-lynxos.h +++ b/ace/config-lynxos.h @@ -40,6 +40,10 @@ # endif /* __GNUC_MINOR__ == 7 */ #endif /* __GNUG__ */ +#if defined ( __LYNXOS_SDK_VERSION ) && ( __LYNXOS_SDK_VERSION <= 199701L ) +# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 0 +#endif /* __LYNXOS_SDK_VERSION */ + #if defined (__x86__) // PowerPC libraries don't seem to have alloca (), so only use with x86. // Although ACE does have alloca() on this compiler/platform combination, it is diff --git a/examples/C++NPv1/Logging_Client.cpp b/examples/C++NPv1/Logging_Client.cpp index d30946fe7ff..1b2c8a5c540 100644 --- a/examples/C++NPv1/Logging_Client.cpp +++ b/examples/C++NPv1/Logging_Client.cpp @@ -132,9 +132,16 @@ int main (int argc, char *argv[]) cin.width (ACE_Log_Record::MAXLOGMSGLEN); for (;;) { + +#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && (ACE_USES_STD_NAMESPACE_ FOR_STDCPP_LIB == 0) + string user_input; + getline (cin, user_input, '\n'); +#else std::string user_input; std::getline (cin, user_input, '\n'); +#endif + if (!cin || cin.eof ()) break; ACE_Time_Value now (ACE_OS::gettimeofday ()); diff --git a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp index 6e451953c75..75981eba6a7 100644 --- a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp +++ b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp @@ -71,8 +71,13 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { } #else for (;;) { +#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && (ACE_USES_STD_NAMESPACE_ FOR_STDCPP_LIB == 0) + string user_input; + getline (cin, user_input, '\n'); +#else std::string user_input; std::getline (cin, user_input, '\n'); +#endif if (user_input == "quit") { reactor->notify (quit_handler); break; |