diff options
| author | msmit <msmit@remedy.nl> | 2010-08-04 13:10:58 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-08-04 13:10:58 +0000 |
| commit | d8baff821612181b6e2101d582b47a7b7f2c9ae2 (patch) | |
| tree | 5ad051421e821cd10b4056fcec7d89ba89be38b6 | |
| parent | a3aa97b1e67a1f9d339219b3072eae7d818dd996 (diff) | |
| download | ATCD-d8baff821612181b6e2101d582b47a7b7f2c9ae2.tar.gz | |
Wed Aug 4 13:10:21 UTC 2010 Marcel Smit <msmit@remedy.nl>
* tao/SystemException.cpp:
Renamed TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING to
TAO_SUPPRESS_NEW_LINE_IN_EXCEPTION_LOGGING.
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/SystemException.cpp | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 718233ece7f..a361b98ef49 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,14 @@ +Wed Aug 4 13:10:21 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * tao/SystemException.cpp: + Renamed TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING to + TAO_SUPPRESS_NEW_LINE_IN_EXCEPTION_LOGGING. + Wed Aug 4 12:21:58 UTC 2010 Marcel Smit <msmit@remedy.nl> * tao/SystemException.cpp: Added TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING define. When set, - no newline character will occur in the exception logging and therefor + no newline character will occur in the exception logging and therefor all logging will appear on one line. Wed Aug 4 08:41:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 8cf80decb90..48f276b0541 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -238,7 +238,7 @@ CORBA::SystemException::_info (void) const ACE_CString info = "system exception, ID '"; info += this->_rep_id (); -#if defined (TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING) +#if defined (TAO_SUPPRESS_NEW_LINE_IN_EXCEPTION_LOGGING) info += "'; "; #else info += "'\n"; @@ -399,7 +399,7 @@ CORBA::SystemException::_info (void) const ACE_OS::sprintf (buffer, "TAO exception, " "minor code = %x (%s; %s), " -#if defined (TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING) +#if defined (TAO_SUPPRESS_NEW_LINE_IN_EXCEPTION_LOGGING) "completed = %s; ", #else "completed = %s\n", @@ -432,7 +432,7 @@ CORBA::SystemException::_info (void) const ACE_OS::sprintf (buffer, "OMG minor code (%d), " "described as '%s', " -#if defined (TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING) +#if defined (TAO_SUPPRESS_NEW_LINE_IN_EXCEPTION_LOGGING) "completed = %s; ", #else "completed = %s\n", @@ -451,7 +451,7 @@ CORBA::SystemException::_info (void) const char buffer[BUFSIZ]; ACE_OS::sprintf (buffer, "Unknown vendor minor code id (%x), " -#if defined (TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING) +#if defined (TAO_SUPPRESS_NEW_LINE_IN_EXCEPTION_LOGGING) "minor code = %x, completed = %s; ", #else "minor code = %x, completed = %s\n", |