diff options
Diffstat (limited to 'TAO/utils/catior/catior.cpp')
| -rw-r--r-- | TAO/utils/catior/catior.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index f4445db7a82..865041a2792 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -70,7 +70,7 @@ catiiop (CORBA::String string, if (cp == 0) { - env.exception (new CORBA_DATA_CONVERSION ()); + env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); return 0; } @@ -88,7 +88,7 @@ catiiop (CORBA::String string, if (cp == 0) { - env.exception (new CORBA_DATA_CONVERSION ()); + env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); CORBA::string_free (hostname); return 0; } @@ -401,7 +401,7 @@ catpoop (CORBA::String string, if (cp == 0) { - env.exception (new CORBA_DATA_CONVERSION ()); + env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); return 0; } @@ -545,7 +545,7 @@ main (int argc, char *argv[]) while (!ifstr.eof ()) { ifstr.get (ch); - if (ch == '\n' || ifstr.eof ()) + if (ch == '\n' || ch == EOF) break; aString += ch; } @@ -595,7 +595,7 @@ main (int argc, char *argv[]) b = catpoop (str, env); } else - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_DEBUG, "Don't know how to decode this IOR\n"), -1); if (b == 1) |