diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-02-03 22:29:10 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-02-03 22:29:10 +0000 |
| commit | da4237b197fb3c2f588c84e4120fc6d295a8b75a (patch) | |
| tree | f580fb98a58f6b01fd4c627d162ff40fa5e09a91 | |
| parent | ec920869b6838ba18012f6547dba706f540f57ca (diff) | |
| download | ATCD-da4237b197fb3c2f588c84e4120fc6d295a8b75a.tar.gz | |
ChangeLogTag:Fri Feb 3 24:30:19 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 4 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/CIAO_common.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 608e688c0dd..01db34da095 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,5 +1,9 @@ Fri Feb 3 24:30:19 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + * ciao/CIAO_common.h: + + Removed extraneous "#" in "# #error" preprocessor directive. + * ciao/Client_init.h: Moved CIAO namespace out of TAO-versioned namespace block. It diff --git a/TAO/CIAO/ciao/CIAO_common.h b/TAO/CIAO/ciao/CIAO_common.h index d55546b2aa3..7e1fb2e4e96 100644 --- a/TAO/CIAO/ciao/CIAO_common.h +++ b/TAO/CIAO/ciao/CIAO_common.h @@ -15,7 +15,7 @@ #include "ace/config-all.h" #if !defined ACE_LACKS_PRAGMA_ONCE -#pragma once +# pragma once #endif /* ! ACE_LACKS_PRAGMA_ONCE */ #include "CIAO_Client_Export.h" @@ -43,7 +43,7 @@ # define CIAO_TRACE(X) # else # if (ACE_NTRACE == 0) -# #error CIAO_TRACE cannot be disabled if ACE_TRACE is enabled +# error CIAO_TRACE cannot be disabled if ACE_TRACE is enabled # else # define CIAO_TRACE(X) # endif |