diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-02-03 22:24:59 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-02-03 22:24:59 +0000 |
| commit | b97ec13eff9ad86c5f70fa9801b0ccb8a53623ea (patch) | |
| tree | 512c76d4a4b5355c0ebfc6e954eb0d7e41ff61cb | |
| parent | 51070ba9d1fe53b10c0317a5c75e14b5762f3240 (diff) | |
| download | ATCD-b97ec13eff9ad86c5f70fa9801b0ccb8a53623ea.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 | 8 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Client_init.h | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 6903f0b8f5c..8dfc7140ca3 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Feb 3 24:30:19 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ciao/Client_init.h: + + Moved CIAO namespace out of TAO-versioned namespace block. It + shouldn't have been there. Fixes namespace clashes in versioned + namespace enabled builds. + Thu Feb 2 23:55:01 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> * NEWS diff --git a/TAO/CIAO/ciao/Client_init.h b/TAO/CIAO/ciao/Client_init.h index 6bf7d7dd712..9c86e386778 100644 --- a/TAO/CIAO/ciao/Client_init.h +++ b/TAO/CIAO/ciao/Client_init.h @@ -1,3 +1,5 @@ +// -*- C++ -*- +// // $Id$ /** @@ -26,6 +28,7 @@ namespace CORBA class ORB; typedef ORB *ORB_ptr; } +TAO_END_VERSIONED_NAMESPACE_DECL namespace CIAO { @@ -36,9 +39,9 @@ namespace CIAO * should be call right after ORB initialization but we should try * to register these stuff automatically. */ - CIAO_CLIENT_Export int Client_init (CORBA::ORB_ptr o); + CIAO_CLIENT_Export int Client_init (CORBA::ORB_ptr o); } -TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* CIAO_CLIENT_INIT_H */ |