diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-06 17:26:20 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-06 17:26:20 +0000 |
| commit | f42661e1a3cf6b3e99fb3c1edb5e97e0b53bc0ee (patch) | |
| tree | 118b5becf3604412f77fd9f4d7688a383353709f | |
| parent | 3f1d5f4d1eca7602c4c62bc307ee8ffb297a58c0 (diff) | |
| download | ATCD-f42661e1a3cf6b3e99fb3c1edb5e97e0b53bc0ee.tar.gz | |
ChangeLogTag: Tue Jan 6 11:23:29 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp | 5 | ||||
| -rw-r--r-- | TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp | 5 | ||||
| -rw-r--r-- | TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp | 2 | ||||
| -rw-r--r-- | TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.cpp | 2 |
5 files changed, 22 insertions, 4 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index bb76c0e84bc..b63044158af 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,15 @@ +Tue Jan 6 11:23:29 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * examples/OEP/BasicSP/EC/client.cpp: + * examples/OEP/BasicSP/EC/controller.cpp: + + Replaced occurrences of cerr with ACE_ERROR_RETURN. + + * examples/OEP/Display/GPS/GPS_exec.cpp: + * examples/OEP/Display/GPS/GPS_tracing_exec.cpp: + + Added #include of ace/OS_NS_time.h. + Tue Jan 6 10:16:51 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tools/Assembly_Deployer/Assembly_Manager.cpp: diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp b/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp index 7de404f4beb..f176603b078 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp +++ b/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp @@ -63,8 +63,9 @@ main (int argc, char *argv[]) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Who is the culprit \n"); - cerr << "Uncaught CORBA exception" << endl; - return 1; + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); } ACE_ENDTRY; diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp index 0d6a328b217..1bfbbaf8a8c 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp +++ b/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp @@ -116,8 +116,9 @@ main (int argc, char *argv[]) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Who is the culprit \n"); - cerr << "Uncaught CORBA exception" << endl; - return 1; + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); } ACE_ENDTRY; diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp b/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp index da25ff45580..9f8c8104d48 100644 --- a/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp +++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp @@ -2,6 +2,8 @@ #include "GPS_exec.h" +#include "ace/OS_NS_time.h" + #define DISPLACEMENT 256 /// Default constructor. diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.cpp b/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.cpp index e0e2a642999..60d4e77a15c 100644 --- a/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.cpp +++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.cpp @@ -2,6 +2,8 @@ #include "GPS_tracing_exec.h" +#include "ace/OS_NS_time.h" + #define DISPLACEMENT 256 /// Default constructor. |