summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL/util/utl_err.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/TAO_IDL/util/utl_err.cpp')
-rw-r--r--TAO/TAO_IDL/util/utl_err.cpp82
1 files changed, 42 insertions, 40 deletions
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index db47cd9df03..f412e4c0d09 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -81,6 +81,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
// FUZZ: disable check_for_streams_include
#include "ace/streams.h"
+#include "ace/Log_Msg.h"
+
ACE_RCSID (util,
utl_err,
"$Id$")
@@ -221,12 +223,12 @@ error_string (UTL_Error::ErrorCode c)
static void
idl_error_header (UTL_Error::ErrorCode c,
long lineno,
- UTL_String *s)
+ ACE_CString s)
{
ACE_ERROR ((LM_ERROR,
"%s: \"%s\", line %d: %s",
idl_global->prog_name (),
- s->get_string (),
+ s.c_str (),
lineno == -1 ? idl_global->lineno () : lineno,
error_string (c)));
}
@@ -624,7 +626,7 @@ UTL_Error::syntax_error (IDL_GlobalData::ParseState ps)
{
idl_error_header (EIDL_SYNTAX_ERROR,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"%s\n",
parse_state_to_error_message (ps)));
@@ -636,7 +638,7 @@ UTL_Error::error0 (UTL_Error::ErrorCode c)
{
idl_error_header (c,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"\n"));
idl_global->set_err_count (idl_global->err_count () + 1);
@@ -648,7 +650,7 @@ UTL_Error::error1 (UTL_Error::ErrorCode c,
{
idl_error_header (c,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -662,7 +664,7 @@ UTL_Error::error2 (UTL_Error::ErrorCode c,
{
idl_error_header (c,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
ACE_ERROR ((LM_ERROR,
", "));
@@ -680,7 +682,7 @@ UTL_Error::error3 (UTL_Error::ErrorCode c,
{
idl_error_header (c,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
ACE_ERROR ((LM_ERROR,
", "));
@@ -700,7 +702,7 @@ UTL_Error::warning0 (UTL_Error::ErrorCode c)
{
idl_error_header (c,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"\n"));
}
@@ -714,7 +716,7 @@ UTL_Error::warning1 (UTL_Error::ErrorCode c,
{
idl_error_header (c,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -730,7 +732,7 @@ UTL_Error::warning2 (UTL_Error::ErrorCode c,
{
idl_error_header (c,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
", "));
@@ -750,7 +752,7 @@ UTL_Error::warning3 (UTL_Error::ErrorCode c,
{
idl_error_header (c,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
", "));
@@ -770,7 +772,7 @@ UTL_Error::coercion_error (AST_Expression *v,
{
idl_error_header (EIDL_COERCION_FAILURE,
v->line (),
- v->file_name ());
+ v->file_name ()->get_string ());
v->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
" to %s\n",
@@ -784,7 +786,7 @@ UTL_Error::lookup_error (UTL_ScopedName *n)
{
idl_error_header (EIDL_LOOKUP_ERROR,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
n->dump (*ACE_DEFAULT_LOG_STREAM);;
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -797,7 +799,7 @@ UTL_Error::version_number_error (char *n)
{
idl_error_header (EIDL_ILLEGAL_VERSION,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"%s\n",
n));
@@ -810,7 +812,7 @@ UTL_Error::version_reset_error (void)
{
idl_error_header (EIDL_VERSION_RESET,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"\n"));
idl_global->set_err_count (idl_global->err_count () + 1);
@@ -823,7 +825,7 @@ UTL_Error::id_reset_error (const char *o,
{
idl_error_header (EIDL_ID_RESET,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"%s, %s\n",
o,
@@ -858,7 +860,7 @@ UTL_Error::inheritance_error (UTL_ScopedName *n,
{
idl_error_header (EIDL_CANT_INHERIT,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
n->dump (*ACE_DEFAULT_LOG_STREAM);;
ACE_ERROR ((LM_ERROR,
" attempts to inherit from "));
@@ -895,7 +897,7 @@ UTL_Error::supports_error (UTL_ScopedName *n,
{
idl_error_header (EIDL_CANT_SUPPORT,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
n->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
" attempts to support "));
@@ -911,7 +913,7 @@ UTL_Error::derived_supports_error (UTL_ScopedName *n)
{
idl_error_header (EIDL_CANT_SUPPORT,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"derived component or home "));
n->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -927,7 +929,7 @@ UTL_Error::abstract_inheritance_error (UTL_ScopedName *v,
{
idl_error_header (EIDL_CANT_INHERIT,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
" abstract valuetype "));
v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -946,7 +948,7 @@ UTL_Error::abstract_support_error (UTL_ScopedName *v,
{
idl_error_header (EIDL_CANT_SUPPORT,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
" valuetype "));
v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -965,7 +967,7 @@ UTL_Error::unconstrained_interface_expected (UTL_ScopedName *c,
{
idl_error_header (EIDL_CANT_SUPPORT,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
" component or home "));
c->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -983,7 +985,7 @@ UTL_Error::concrete_supported_inheritance_error (UTL_ScopedName *v,
{
idl_error_header (EIDL_CANT_SUPPORT,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
" valuetype "));
v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1003,7 +1005,7 @@ UTL_Error::eval_error (AST_Expression *v)
{
idl_error_header (EIDL_EVAL_ERROR,
v->line (),
- v->file_name ());
+ v->file_name ()->get_string ());
v->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -1016,7 +1018,7 @@ UTL_Error::incompatible_type_error (AST_Expression *v)
{
idl_error_header (EIDL_INCOMPATIBLE_TYPE,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
v->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -1050,7 +1052,7 @@ UTL_Error::interface_expected (AST_Decl *d)
{
idl_error_header (EIDL_INTERFACE_EXPECTED,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -1065,7 +1067,7 @@ UTL_Error::valuetype_expected (AST_Decl *d)
{
idl_error_header (EIDL_VALUETYPE_EXPECTED,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -1080,7 +1082,7 @@ UTL_Error::concrete_valuetype_expected (AST_Decl *d)
{
idl_error_header (EIDL_CONCRETE_VT_EXPECTED,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -1096,7 +1098,7 @@ UTL_Error::abstract_expected (AST_Decl *d)
{
idl_error_header (EIDL_ABSTRACT_EXPECTED,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -1112,7 +1114,7 @@ UTL_Error::eventtype_expected (AST_Decl *d)
{
idl_error_header (EIDL_EVENTTYPE_EXPECTED,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
ACE_ERROR ((LM_ERROR,
"\n"));
@@ -1127,7 +1129,7 @@ UTL_Error::primary_key_error (AST_Decl *d)
{
idl_error_header (EIDL_PRIMARY_KEY_ERROR,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"primary key "));
d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1186,7 +1188,7 @@ UTL_Error::redef_error (char *b,
{
idl_error_header (EIDL_REDEF,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"\"%s\" and \"%s\"\n",
b,
@@ -1201,7 +1203,7 @@ UTL_Error::name_case_error (char *b,
{
idl_error_header (EIDL_NAME_CASE_ERROR,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"\"%s\" and \"%s\"\n",
b,
@@ -1217,7 +1219,7 @@ UTL_Error::name_case_warning (char *b,
{
idl_error_header (EIDL_NAME_CASE_WARNING,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"\"%s\" and \"%s\"\n",
b,
@@ -1230,7 +1232,7 @@ UTL_Error::idl_keyword_error (char *n)
{
idl_error_header (EIDL_KEYWORD_ERROR,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"\"%s\"\n",
n));
@@ -1244,7 +1246,7 @@ UTL_Error::idl_keyword_warning (char *n)
{
idl_error_header (EIDL_KEYWORD_WARNING,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"\"%s\"\n",
n));
@@ -1294,7 +1296,7 @@ UTL_Error::fwd_decl_lookup (AST_Interface *d,
{
idl_error_header (EIDL_FWD_DECL_LOOKUP,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"trying to look up "));
n->dump (*ACE_DEFAULT_LOG_STREAM);;
@@ -1329,7 +1331,7 @@ UTL_Error::not_a_type (AST_Decl *d)
{
idl_error_header (EIDL_NOT_A_TYPE,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
if (d == 0 || d->name () == 0)
{
ACE_ERROR ((LM_ERROR,
@@ -1351,7 +1353,7 @@ UTL_Error::back_end (long lineno,
{
idl_error_header (EIDL_BACK_END,
lineno,
- s);
+ s->get_string ());
ACE_ERROR ((LM_ERROR,
"\n"));
idl_global->set_err_count (idl_global->err_count () + 1);
@@ -1362,7 +1364,7 @@ UTL_Error::illegal_infix (void)
{
idl_error_header (EIDL_ILLEGAL_INFIX,
idl_global->lineno (),
- idl_global->filename ());
+ idl_global->filename ()->get_string ());
ACE_ERROR ((LM_ERROR,
"\n"));
idl_global->set_err_count (idl_global->err_count () + 1);
View Lorry Controller Status