diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-06 20:01:41 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-06 20:01:41 +0000 |
| commit | b62508c3b4b082ab9f1c225bd6db80341ceab4f9 (patch) | |
| tree | 3ed01ae52d3a8265cab1af0ae627ee00ba9aaa8d | |
| parent | 498a2b804b8d142a93e917361619bfc1440f216c (diff) | |
| download | ATCD-b62508c3b4b082ab9f1c225bd6db80341ceab4f9.tar.gz | |
Wed Jun 6 20:00:19 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu>
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/examples/Null_Component/plan.h | 19 |
2 files changed, 24 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 3c20e1b48ba..aa7bf28d380 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 6 20:00:19 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu> + + * examples/Null_Component/plan.h + + Fixed Sun C++ on Salaris 10 linkage warning regarding + extern "C" and extern "C++" mismatch. + Wed Jun 6 16:52:46 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu> * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp diff --git a/CIAO/examples/Null_Component/plan.h b/CIAO/examples/Null_Component/plan.h index fce247dc321..53ace376bcb 100644 --- a/CIAO/examples/Null_Component/plan.h +++ b/CIAO/examples/Null_Component/plan.h @@ -6,6 +6,21 @@ extern "C" ::PortableServer::Servant create_Null_Component_Home_Servant ::CIAO::Session_Container *c, const char*); +// Below two extern "C++" is to fixing the "Anachronism" warning of Sun C++ 5.7 + +extern "C++" ::Components::HomeExecutorBase_ptr create_Null_Component_Home_Impl_wrapper (void) +{ + return create_Null_Component_Home_Impl (); +} + +extern "C++" ::PortableServer::Servant create_Null_Component_Home_Servant_wrapper + (::Components::HomeExecutorBase_ptr p, + ::CIAO::Session_Container *c, + const char* no_op) +{ + return create_Null_Component_Home_Servant (p, c, no_op); +} + struct HomeAttributes { char const * component_instance_name_; @@ -23,9 +38,9 @@ static const HomeAttributes homes_table[] = { "Null_Component_ComponentImplementations_Null_Assembly_Container_Null_Assembly_Null_Component", "create_Null_Component_Home_Impl", - create_Null_Component_Home_Impl, + create_Null_Component_Home_Impl_wrapper, "create_Null_Component_Home_Servant", - create_Null_Component_Home_Servant + create_Null_Component_Home_Servant_wrapper }, }; |