summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-17 04:12:10 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-17 04:12:10 +0000
commit2cac6ad124c3dd138c75b18b5449bf1176d591fe (patch)
tree0f1f060a5b9ddd37703319314f745e77f958b88b
parentab6f4592e8cf28e6e771607c4f50ba1171d583d0 (diff)
downloadATCD-2cac6ad124c3dd138c75b18b5449bf1176d591fe.tar.gz
*** empty log message ***
-rw-r--r--TAO/CIAO/ChangeLog69
-rwxr-xr-xTAO/CIAO/bin/generate_component_mpc.pl4
-rw-r--r--TAO/CIAO/ciao/Container_Base.cpp2
-rw-r--r--TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp2
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc4
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/GPS/GPSE.idl2
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.cpp4
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.h2
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/GPS/GPS_svnt.cpp8
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp4
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.h2
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc4
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.cpp6
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.inl4
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc4
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp6
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.h2
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp8
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc2
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp2
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h2
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc8
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/RateGen/RateGenE.idl4
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.cpp8
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.h4
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_svnt.cpp24
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/RateGen/client.cpp2
-rw-r--r--TAO/CIAO/examples/handcrafted/Display/RateGen/controller.cpp2
-rw-r--r--TAO/CIAO/examples/handcrafted/Hello/client.cpp17
-rw-r--r--TAO/CIAO/examples/handcrafted/Hello/hello.mpc5
-rw-r--r--TAO/CIAO/examples/handcrafted/Hello/helloE.idl2
-rw-r--r--TAO/CIAO/examples/handcrafted/Hello/hello_servants.cpp6
-rw-r--r--TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc6
-rw-r--r--TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp5
-rw-r--r--TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp8
-rw-r--r--TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.h2
-rw-r--r--TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.inl1
-rw-r--r--TAO/CIAO/tools/ComponentServer/ComponentServer.cpp6
-rw-r--r--TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp2
-rw-r--r--TAO/CIAO/tools/Daemon/controller_i.cpp2
-rw-r--r--TAO/CIAO/tools/Daemon/controller_i.h2
-rw-r--r--TAO/CIAO/tools/ServerActivator/ServerActivator_test_client.cpp5
-rw-r--r--TAO/CIAO/tools/XML_Helpers/Assembly_Handlers.cpp15
-rw-r--r--TAO/CIAO/tools/XML_Helpers/Assembly_Spec.cpp2
-rw-r--r--TAO/CIAO/tools/XML_Helpers/Assembly_Spec.inl4
-rw-r--r--TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.cpp14
-rw-r--r--TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.cpp3
47 files changed, 204 insertions, 98 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 2ca9736e968..5e2aed74e19 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,72 @@
+Wed Apr 16 22:56:32 2003 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ The followings are fixes to make CIAO to compile and work on
+ Linux.
+
+ * bin/generate_component_mpc.pl:
+ * examples/handcrafted/Display/HUDisplay.mpc:
+ * examples/handcrafted/Display/GPS/GPS.mpc:
+ * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc:
+ * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc:
+ * examples/handcrafted/Display/RateGen/RateGen.mpc:
+ * examples/handcrafted/Hello/hello.mpc:
+ * tools/Assembly_Deployer/Assembly_Deployer.mpc: Reordered the
+ source file listing so that IDL files will always be compiled
+ before other files to avoid non-existing generated file
+ problem. Also added missing library dependencies to some MPC
+ files.
+
+ * examples/handcrafted/Display/HUDisplay_svnt.cpp:
+ * examples/handcrafted/Display/HUDisplay_svnt.inl:
+ * examples/handcrafted/Display/GPS/GPSE.idl:
+ * examples/handcrafted/Display/GPS/GPS_exec.cpp:
+ * examples/handcrafted/Display/GPS/GPS_exec.h:
+ * examples/handcrafted/Display/GPS/GPS_svnt.cpp:
+ * examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp:
+ * examples/handcrafted/Display/GPS/GPS_tracing_exec.h:
+ * examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp:
+ * examples/handcrafted/Display/NavDisplay/NavDisplay_exec.h:
+ * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp:
+ * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp:
+ * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h:
+ * examples/handcrafted/Display/RateGen/RateGenE.idl:
+ * examples/handcrafted/Display/RateGen/RateGen_exec.cpp:
+ * examples/handcrafted/Display/RateGen/RateGen_exec.h:
+ * examples/handcrafted/Display/RateGen/RateGen_svnt.cpp:
+ * examples/handcrafted/Display/RateGen/client.cpp:
+ * examples/handcrafted/Display/RateGen/controller.cpp:
+ * examples/handcrafted/Hello/client.cpp:
+ * examples/handcrafted/Hello/helloE.idl:
+ * examples/handcrafted/Hello/hello_servants.cpp:
+ * tools/Assembly_Deployer/Assembly_Impl.cpp:
+ * tools/Assembly_Deployer/Assembly_Manager.cpp:
+ * tools/Assembly_Deployer/Assembly_Visitors.h:
+ * tools/Assembly_Deployer/Assembly_Visitors.inl:
+ * tools/ComponentServer/ComponentServer.cpp:
+ * tools/ComponentServer/ComponentServer_test_client.cpp:
+ * tools/Daemon/controller_i.cpp:
+ * tools/Daemon/controller_i.h:
+ * tools/ServerActivator/ServerActivator_test_client.cpp:
+ * tools/XML_Helpers/Assembly_Handlers.cpp:
+ * tools/XML_Helpers/Assembly_Spec.cpp:
+ * tools/XML_Helpers/Assembly_Spec.inl:
+ * tools/XML_Helpers/Cascadable_DocHandler.cpp:
+ * tools/XML_Helpers/Softpkg_Handlers.cpp: Fixed compilation errors
+ and warnings. They include
+
+ Using a _var in places where a _ptr is expected.
+
+ Incorrect Capitalization of file names.
+
+ Unused variables warnings.
+
+ Exception throw specification mis-matches.
+
+ * docs/templates/CIAO_Glue_Session_Template.cpp: Propagated
+ previous fixes into the tempate code.
+
+ * ciao/Container_Base.cpp: Removed a redundant ACE_INLINE decl.
+
Tue Apr 15 17:07:52 2003 Nanbor Wang <nanbor@cs.wustl.edu>
* tools/XML_Helpers/Assembly_Spec.h:
diff --git a/TAO/CIAO/bin/generate_component_mpc.pl b/TAO/CIAO/bin/generate_component_mpc.pl
index 2998faea2c1..c7e8d9af83e 100755
--- a/TAO/CIAO/bin/generate_component_mpc.pl
+++ b/TAO/CIAO/bin/generate_component_mpc.pl
@@ -138,9 +138,9 @@ project('."$com_name".'_svnt) : ciao_server {
}
Source_Files {
- '."$com_name".'_svnt.cpp
- '."$com_name".'S.cpp
'."$com_name".'EC.cpp
+ '."$com_name".'S.cpp
+ '."$com_name".'_svnt.cpp
}
}
'."
diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp
index 1ed84f5e973..110bbfd0217 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -87,7 +87,7 @@ CIAO::Session_Container::init (const char *name
return 0;
}
-ACE_INLINE CORBA::Object_ptr
+CORBA::Object_ptr
CIAO::Session_Container::install_servant (PortableServer::Servant p
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
index 6168d3db958..96559f34473 100644
--- a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
+++ b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
@@ -357,7 +357,7 @@ CORBA::Object_ptr
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- [facet type]_var fo = [facet type]::_narrow (obj
+ [facet type]_var fo = [facet type]::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
index a27b224f96a..43d6dd6d847 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
@@ -30,9 +30,9 @@ project(GPS_svnt) : ciao_server {
}
Source_Files {
- GPS_svnt.cpp
- GPSS.cpp
GPSEC.cpp
+ GPSS.cpp
+ GPS_svnt.cpp
}
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPSE.idl b/TAO/CIAO/examples/handcrafted/Display/GPS/GPSE.idl
index c6df8a40e1a..44b08652d0e 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPSE.idl
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPSE.idl
@@ -17,7 +17,7 @@
// For various definitions of container
// internal/callback interfaces
#include "GPS.idl" // Original component IDL definition
-#include "..\HUDisplayE.idl"
+#include "../HUDisplayE.idl"
module HUDisplay {
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.cpp b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.cpp
index 543940c13a2..595fb77390f 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.cpp
@@ -27,7 +27,7 @@ MyImpl::GPS_exec_i::get_MyLocation (ACE_ENV_SINGLE_ARG_DECL)
}
void
-MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick_ptr ev
+MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick_ptr
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -118,7 +118,7 @@ MyImpl::GPSHome_exec_i::~GPSHome_exec_i ()
::Components::EnterpriseComponent_ptr
MyImpl::GPSHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure))
+ Components::CCMException))
{
return new MyImpl::GPS_exec_i;
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.h b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.h
index 352c9dd9d24..6bd314e7e3b 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.h
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec.h
@@ -114,7 +114,7 @@ namespace MyImpl
virtual ::Components::EnterpriseComponent_ptr
create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure));
+ Components::CCMException));
};
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_svnt.cpp b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_svnt.cpp
index 702d0928386..190e32ea4b0 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_svnt.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_svnt.cpp
@@ -178,7 +178,7 @@ CIAO_GLUE_HUDisplay::GPS_Servant::provide_MyLocation (ACE_ENV_SINGLE_ARG_DECL)
ACE_CHECK_RETURN (0);
HUDisplay::position_var fo
- = HUDisplay::position::_narrow (obj
+ = HUDisplay::position::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
@@ -218,7 +218,7 @@ CIAO_GLUE_HUDisplay::GPS_Servant::get_consumer_Refresh (ACE_ENV_SINGLE_ARG_DECL)
if (CORBA::is_nil (this->consumes_Refresh_.in ()))
{
CIAO_GLUE_HUDisplay::GPS_Servant::tickConsumer_Refresh_Servant *svt =
- new CIAO_GLUE_HUDisplay::GPS_Servant::tickConsumer_Refresh_Servant (this->executor_,
+ new CIAO_GLUE_HUDisplay::GPS_Servant::tickConsumer_Refresh_Servant (this->executor_.in (),
this->context_);
PortableServer::ServantBase_var safe_servant (svt);
@@ -227,7 +227,7 @@ CIAO_GLUE_HUDisplay::GPS_Servant::get_consumer_Refresh (ACE_ENV_SINGLE_ARG_DECL)
ACE_CHECK_RETURN (0);
HUDisplay::tickConsumer_var eco
- = HUDisplay::tickConsumer::_narrow (obj
+ = HUDisplay::tickConsumer::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
@@ -584,7 +584,7 @@ CIAO_GLUE_HUDisplay::GPS_Servant::get_all_publishers (ACE_ENV_SINGLE_ARG_DECL)
}
::Components::PublisherDescriptions *
-CIAO_GLUE_HUDisplay::GPS_Servant::get_named_publishers (const Components::NameList & names
+CIAO_GLUE_HUDisplay::GPS_Servant::get_named_publishers (const Components::NameList &
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName))
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp
index 9c52db56f29..eae33e8d742 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp
@@ -28,7 +28,7 @@ MyImpl::GPS_tracing_exec_i::get_MyLocation (ACE_ENV_SINGLE_ARG_DECL)
}
void
-MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick_ptr ev
+MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick_ptr
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -124,7 +124,7 @@ MyImpl::GPSHome_tracing_exec_i::~GPSHome_tracing_exec_i ()
::Components::EnterpriseComponent_ptr
MyImpl::GPSHome_tracing_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure))
+ Components::CCMException))
{
return new MyImpl::GPS_tracing_exec_i;
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.h b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.h
index fb27c70740f..5da08ff017a 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.h
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.h
@@ -112,7 +112,7 @@ namespace MyImpl
virtual ::Components::EnterpriseComponent_ptr
create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure));
+ Components::CCMException));
};
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc
index fc3e5a92ca6..b1d448a57ef 100644
--- a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc
@@ -29,8 +29,8 @@ project(HUDisplay_svnt) : ciao_server {
}
Source_Files {
- HUDisplay_svnt.cpp
- HUDisplayS.cpp
HUDisplayEC.cpp
+ HUDisplayS.cpp
+ HUDisplay_svnt.cpp
}
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.cpp b/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.cpp
index 81f8bccea54..7a01b737b67 100644
--- a/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.cpp
@@ -19,14 +19,14 @@ CORBA::Object_ptr
CIAO_GLUE_HUDisplay::position_Servant::_get_component (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- ::Components::SessionContext_var sc =
- ::Components::SessionContext::_narrow (this->ctx_);
+ Components::SessionContext_var sc =
+ Components::SessionContext::_narrow (this->ctx_.in ());
if (! CORBA::is_nil(sc.in ()))
return sc->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
::Components::EntityContext_var ec =
- ::Components::EntityContext::_narrow (this->ctx_);
+ ::Components::EntityContext::_narrow (this->ctx_.in ());
if (! CORBA::is_nil(ec.in ()))
return ec->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.inl b/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.inl
index 6a904e45130..e4ea00247cc 100644
--- a/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.inl
+++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt.inl
@@ -11,7 +11,7 @@ ACE_INLINE
CIAO_GLUE_HUDisplay::position_Servant::position_Servant (HUDisplay::CCM_position_ptr executor,
Components::CCMContext_ptr c)
: executor_ (HUDisplay::CCM_position::_duplicate (executor)),
- ctx_ (c)
+ ctx_ (Components::CCMContext::_duplicate (c))
{
}
@@ -26,6 +26,7 @@ CIAO_GLUE_HUDisplay::position_Servant::~position_Servant ()
ACE_INLINE CORBA::Long
CIAO_GLUE_HUDisplay::position_Servant::posx (ACE_ENV_SINGLE_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
// Simply relay to executor. May not need to return the result...
return this->executor_->posx (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -33,6 +34,7 @@ CIAO_GLUE_HUDisplay::position_Servant::posx (ACE_ENV_SINGLE_ARG_DECL)
ACE_INLINE CORBA::Long
CIAO_GLUE_HUDisplay::position_Servant::posy (ACE_ENV_SINGLE_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
// Simply relay to executor. May not need to return the result...
return this->executor_->posy (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
index 8be86996a1f..a538a173ca2 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
@@ -29,9 +29,9 @@ project(NavDisplay_svnt) : ciao_server {
}
Source_Files {
- NavDisplay_svnt.cpp
- NavDisplayS.cpp
NavDisplayEC.cpp
+ NavDisplayS.cpp
+ NavDisplay_svnt.cpp
}
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp
index cafdb475111..93c6b117294 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp
@@ -1,6 +1,6 @@
// $Id$
-#include "CIAO_Common.h"
+#include "CIAO_common.h"
#include "NavDisplay_exec.h"
/// Default constructor.
@@ -20,6 +20,8 @@ MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick_ptr ev
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
+ ACE_UNUSED_ARG (ev);
+
// Refresh position
HUDisplay::position_var loc
= this->context_->get_connection_GPSLocation (ACE_ENV_ARG_PARAMETER);
@@ -113,7 +115,7 @@ MyImpl::NavDisplayHome_exec_impl::~NavDisplayHome_exec_impl ()
::Components::EnterpriseComponent_ptr
MyImpl::NavDisplayHome_exec_impl::create (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure))
+ Components::CCMException))
{
return new MyImpl::NavDisplay_exec_impl;
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.h b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.h
index 179d2bd4c79..149ee5b9520 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.h
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec.h
@@ -90,7 +90,7 @@ namespace MyImpl
virtual ::Components::EnterpriseComponent_ptr
create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure));
+ Components::CCMException));
};
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp
index a4a78978748..e290ebba108 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp
@@ -166,7 +166,7 @@ CIAO_GLUE_HUDisplay::NavDisplay_Servant::get_consumer_Refresh (ACE_ENV_SINGLE_AR
if (CORBA::is_nil (this->consumes_Refresh_.in ()))
{
CIAO_GLUE_HUDisplay::NavDisplay_Servant::tickConsumer_Refresh_Servant *svt =
- new CIAO_GLUE_HUDisplay::NavDisplay_Servant::tickConsumer_Refresh_Servant (this->executor_,
+ new CIAO_GLUE_HUDisplay::NavDisplay_Servant::tickConsumer_Refresh_Servant (this->executor_.in (),
this->context_);
PortableServer::ServantBase_var safe_servant (svt);
@@ -175,7 +175,7 @@ CIAO_GLUE_HUDisplay::NavDisplay_Servant::get_consumer_Refresh (ACE_ENV_SINGLE_AR
ACE_CHECK_RETURN (0);
HUDisplay::tickConsumer_var eco
- = HUDisplay::tickConsumer::_narrow (obj
+ = HUDisplay::tickConsumer::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
@@ -192,6 +192,7 @@ CIAO_GLUE_HUDisplay::NavDisplay_Servant::provide_facet (const char * name
ACE_THROW_SPEC ((CORBA::SystemException ,
Components::InvalidName))
{
+ ACE_UNUSED_ARG (name);
ACE_THROW_RETURN (::Components::InvalidName (), 0);
}
@@ -213,6 +214,7 @@ CIAO_GLUE_HUDisplay::NavDisplay_Servant::get_named_facets (const Components::Nam
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName))
{
+ ACE_UNUSED_ARG (names);
ACE_THROW_RETURN (::Components::InvalidName (), 0);
}
@@ -277,6 +279,7 @@ CIAO_GLUE_HUDisplay::NavDisplay_Servant::disconnect (const char * name,
Components::CookieRequired,
Components::NoConnection))
{
+ ACE_UNUSED_ARG (ck);
// @@ We can omit this if clause if there's no receptacle in this component.
if (name == 0)
ACE_THROW_RETURN (Components::InvalidName (), 0);
@@ -525,6 +528,7 @@ CIAO_GLUE_HUDisplay::NavDisplay_Servant::get_named_publishers (const Components:
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName))
{
+ ACE_UNUSED_ARG (names);
// @@ to-do
// Need to add interfaces in the Context class to gather the information.
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index ce3dc106420..61350c1e70e 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -12,6 +12,7 @@ project(NavDisplayGUI_exec) : ciao_server {
}
Source_Files {
+ ../NavDisplay/NavDisplayEIC.cpp
AddNavUnitCmd.cpp
DetailView.cpp
MapView.cpp
@@ -25,7 +26,6 @@ project(NavDisplayGUI_exec) : ciao_server {
RootPanel.cpp
UpdatePositionCmd.cpp
Worker.cpp
- ../NavDisplay/NavDisplayEIC.cpp
NavDisplayGUI_exec.cpp
}
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
index cb654aeef5f..46f31e5fb5e 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
@@ -169,7 +169,7 @@ MyImpl::NavDisplayGUIHome_exec_impl::~NavDisplayGUIHome_exec_impl ()
::Components::EnterpriseComponent_ptr
MyImpl::NavDisplayGUIHome_exec_impl::create (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure))
+ Components::CCMException))
{
ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUIHome_exec_impl::create()\n"));
return new MyImpl::NavDisplayGUI_exec_impl;
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
index deeb1157b09..242c46b3b79 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
@@ -99,7 +99,7 @@ namespace MyImpl
virtual ::Components::EnterpriseComponent_ptr
create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure));
+ Components::CCMException));
};
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc
index dab7f24c219..5449f3f3e5b 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc
@@ -19,7 +19,7 @@ project(RateGen_stub): ciao_client {
project(RateGen_svnt) : ciao_server {
depends += HUDisplay_svnt RateGen_stub
sharedname = RateGen_svnt
- libs += RateGen_stub HUDisplay_stub
+ libs += RateGen_stub HUDisplay_stub HUDisplay_svnt
libpaths += ..
idlflags += -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h
dllflags = RATEGEN_SVNT_BUILD_DLL
@@ -29,9 +29,9 @@ project(RateGen_svnt) : ciao_server {
}
Source_Files {
- RateGen_svnt.cpp
- RateGenS.cpp
RateGenEC.cpp
+ RateGenS.cpp
+ RateGen_svnt.cpp
}
}
@@ -59,6 +59,7 @@ project(RateGen_exec) : ciao_server {
project (RateGen_client) : ciao_client {
exename = client
depends += RateGen_stub
+ libs += RateGen_stub HUDisplay_stub
IDL_Files {
}
@@ -72,6 +73,7 @@ project (RateGen_client) : ciao_client {
project (controller) : ciao_client {
exename = controller
depends += RateGen_stub
+ libs += RateGen_stub HUDisplay_stub
IDL_Files {
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGenE.idl b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGenE.idl
index 51399782b25..dacd2f25c33 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGenE.idl
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGenE.idl
@@ -49,13 +49,13 @@ module HUDisplay
: Components::HomeExecutorBase
{
Components::EnterpriseComponent new_RateGen (in long hertz)
- raises (Components::CreateFailure);
+ raises (Components::CCMException);
};
local interface CCM_RateGenHomeImplicit
{
Components::EnterpriseComponent create ()
- raises (Components::CreateFailure);
+ raises (Components::CCMException);
};
local interface CCM_RateGenHome
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.cpp b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.cpp
index 495e1b34175..235618b410f 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.cpp
@@ -87,8 +87,8 @@ MyImpl::Pulse_Handler::handle_close (ACE_HANDLE handle,
}
int
-MyImpl::Pulse_Handler::handle_timeout (const ACE_Time_Value &tv,
- const void *arg)
+MyImpl::Pulse_Handler::handle_timeout (const ACE_Time_Value &,
+ const void *)
{
this->pulse_callback_->pulse ();
@@ -258,7 +258,7 @@ MyImpl::RateGenHome_exec_i::~RateGenHome_exec_i ()
MyImpl::RateGenHome_exec_i::new_RateGen (CORBA::Long hertz
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure))
+ Components::CCMException))
{
return new MyImpl::RateGen_exec_i (hertz);
}
@@ -266,7 +266,7 @@ MyImpl::RateGenHome_exec_i::new_RateGen (CORBA::Long hertz
::Components::EnterpriseComponent_ptr
MyImpl::RateGenHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure))
+ Components::CCMException))
{
return new MyImpl::RateGen_exec_i ();
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.h b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.h
index e8327a45225..24e11a795e3 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.h
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec.h
@@ -162,14 +162,14 @@ namespace MyImpl
new_RateGen (CORBA::Long hertz
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure));
+ Components::CCMException));
// Implicit home operations.
virtual ::Components::EnterpriseComponent_ptr
create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
- Components::CreateFailure));
+ Components::CCMException));
};
}
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_svnt.cpp b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_svnt.cpp
index 0d13146fc14..536bc66ba64 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_svnt.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_svnt.cpp
@@ -236,8 +236,8 @@ CIAO_GLUE_HUDisplay::RateGen_Servant::same_component (CORBA::Object_ptr object_r
// Operations for Receptacles interface
::Components::Cookie_ptr
-CIAO_GLUE_HUDisplay::RateGen_Servant::connect (const char * name,
- CORBA::Object_ptr connection
+CIAO_GLUE_HUDisplay::RateGen_Servant::connect (const char *,
+ CORBA::Object_ptr
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName,
@@ -257,8 +257,8 @@ CIAO_GLUE_HUDisplay::RateGen_Servant::connect (const char * name,
*/
CORBA::Object_ptr
-CIAO_GLUE_HUDisplay::RateGen_Servant::disconnect (const char * name,
- Components::Cookie_ptr ck
+CIAO_GLUE_HUDisplay::RateGen_Servant::disconnect (const char *,
+ Components::Cookie_ptr
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName,
@@ -270,7 +270,7 @@ CIAO_GLUE_HUDisplay::RateGen_Servant::disconnect (const char * name,
}
::Components::ConnectionDescriptions *
-CIAO_GLUE_HUDisplay::RateGen_Servant::get_connections (const char * name
+CIAO_GLUE_HUDisplay::RateGen_Servant::get_connections (const char *
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName))
@@ -307,7 +307,7 @@ CIAO_GLUE_HUDisplay::RateGen_Servant::get_named_receptacles (const Components::N
// Operations for Events interface
::Components::EventConsumerBase_ptr
-CIAO_GLUE_HUDisplay::RateGen_Servant::get_consumer (const char * sink_name
+CIAO_GLUE_HUDisplay::RateGen_Servant::get_consumer (const char *
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName))
@@ -367,8 +367,8 @@ CIAO_GLUE_HUDisplay::RateGen_Servant::unsubscribe (const char * publisher_name,
}
void
-CIAO_GLUE_HUDisplay::RateGen_Servant::connect_consumer (const char * emitter_name,
- Components::EventConsumerBase_ptr consumer
+CIAO_GLUE_HUDisplay::RateGen_Servant::connect_consumer (const char *,
+ Components::EventConsumerBase_ptr
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName,
@@ -379,8 +379,8 @@ CIAO_GLUE_HUDisplay::RateGen_Servant::connect_consumer (const char * emitter_nam
}
::Components::EventConsumerBase_ptr
-CIAO_GLUE_HUDisplay::RateGen_Servant::disconnect_consumer (const char * source_name
- ACE_ENV_ARG_DECL)
+CIAO_GLUE_HUDisplay::RateGen_Servant::disconnect_consumer (const char *
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName,
Components::NoConnection))
@@ -454,7 +454,7 @@ CIAO_GLUE_HUDisplay::RateGen_Servant::get_all_publishers (ACE_ENV_SINGLE_ARG_DEC
}
::Components::PublisherDescriptions *
-CIAO_GLUE_HUDisplay::RateGen_Servant::get_named_publishers (const Components::NameList & names
+CIAO_GLUE_HUDisplay::RateGen_Servant::get_named_publishers (const Components::NameList &
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::InvalidName))
@@ -561,6 +561,7 @@ CIAO_GLUE_HUDisplay::RateGen_Servant::_get_component (ACE_ENV_SINGLE_ARG_DECL)
void
CIAO_GLUE_HUDisplay::RateGen_Servant::_ciao_activate (ACE_ENV_SINGLE_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
Components::SessionComponent_var temp =
Components::SessionComponent::_narrow (this->executor_.in ()
@@ -573,6 +574,7 @@ CIAO_GLUE_HUDisplay::RateGen_Servant::_ciao_activate (ACE_ENV_SINGLE_ARG_DECL)
void
CIAO_GLUE_HUDisplay::RateGen_Servant::_ciao_passivate (ACE_ENV_SINGLE_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
Components::SessionComponent_var temp =
Components::SessionComponent::_narrow (this->executor_.in ()
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/client.cpp b/TAO/CIAO/examples/handcrafted/Display/RateGen/client.cpp
index 4cb07f82993..1e894f82d81 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/client.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/client.cpp
@@ -26,7 +26,7 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
HUDisplay::RateGenHome_var home
- = HUDisplay::RateGenHome::_narrow (obj
+ = HUDisplay::RateGenHome::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/controller.cpp b/TAO/CIAO/examples/handcrafted/Display/RateGen/controller.cpp
index f2be495dcca..b681531fc53 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/controller.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/controller.cpp
@@ -79,7 +79,7 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
HUDisplay::RateGen_var pulser
- = HUDisplay::RateGen::_narrow (obj
+ = HUDisplay::RateGen::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
diff --git a/TAO/CIAO/examples/handcrafted/Hello/client.cpp b/TAO/CIAO/examples/handcrafted/Hello/client.cpp
index cb8888115de..b85cfda64e5 100644
--- a/TAO/CIAO/examples/handcrafted/Hello/client.cpp
+++ b/TAO/CIAO/examples/handcrafted/Hello/client.cpp
@@ -9,7 +9,8 @@ invoke (CORBA::Object_ptr obj,
ACE_ENV_ARG_DECL)
{
// Narrow
- HelloHome_var hh = HelloHome::_narrow (obj ACE_ENV_ARG_PARAMETER);
+ HelloHome_var hh = HelloHome::_narrow (obj
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1); ;
if (CORBA::is_nil (hh.in ()))
@@ -27,7 +28,7 @@ invoke (CORBA::Object_ptr obj,
ACE_DEBUG ((LM_INFO, "%s\n", hi.in ()));
- hh->remove_component (hw
+ hh->remove_component (hw.in ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
@@ -62,7 +63,8 @@ main (int argc, char *argv[])
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- invoke (obj, "Frodo Baggins using 'find_home_by_name'"
+ invoke (obj.in (),
+ "Frodo Baggins using 'find_home_by_name'"
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -71,7 +73,8 @@ main (int argc, char *argv[])
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- invoke (obj, "Samwise Gamgee using 'find_home_by_home_type'"
+ invoke (obj.in (),
+ "Samwise Gamgee using 'find_home_by_home_type'"
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -80,7 +83,8 @@ main (int argc, char *argv[])
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- invoke (obj, "Meriadoc Brandybuck using 'find_home_by_component_type'"
+ invoke (obj.in (),
+ "Meriadoc Brandybuck using 'find_home_by_component_type'"
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -89,7 +93,8 @@ main (int argc, char *argv[])
= orb->string_to_object ("file://hello.ior" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- invoke (obj, "Meriadoc Brandybuck using 'file://hello.ior'"
+ invoke (obj.in (),
+ "Meriadoc Brandybuck using 'file://hello.ior'"
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
#endif
diff --git a/TAO/CIAO/examples/handcrafted/Hello/hello.mpc b/TAO/CIAO/examples/handcrafted/Hello/hello.mpc
index a952842da8b..902742796d0 100644
--- a/TAO/CIAO/examples/handcrafted/Hello/hello.mpc
+++ b/TAO/CIAO/examples/handcrafted/Hello/hello.mpc
@@ -26,9 +26,9 @@ project(hello_servants) : ciao_server {
}
Source_Files {
- hello_servants.cpp
- helloS.cpp
helloEC.cpp
+ helloS.cpp
+ hello_servants.cpp
}
}
@@ -49,6 +49,7 @@ project(hello_executors) : ciao_server {
project (client) : ciao_client {
exename = client
depends += hello_stub
+ libs += hello_stub
IDL_Files {
}
diff --git a/TAO/CIAO/examples/handcrafted/Hello/helloE.idl b/TAO/CIAO/examples/handcrafted/Hello/helloE.idl
index d07e3a95677..da04d01d64b 100644
--- a/TAO/CIAO/examples/handcrafted/Hello/helloE.idl
+++ b/TAO/CIAO/examples/handcrafted/Hello/helloE.idl
@@ -4,7 +4,7 @@
// tao_idl -I ../../.. -I ../../../.. -I ../../../../orbsvcs/orbsvcs -Sc helloE.idl
#include "ciao/CCM_Container.idl"
-#include "Hello.idl"
+#include "hello.idl"
local interface CCM_Hello : Hello
{
diff --git a/TAO/CIAO/examples/handcrafted/Hello/hello_servants.cpp b/TAO/CIAO/examples/handcrafted/Hello/hello_servants.cpp
index bd88c85b2f1..f7d61b94b55 100644
--- a/TAO/CIAO/examples/handcrafted/Hello/hello_servants.cpp
+++ b/TAO/CIAO/examples/handcrafted/Hello/hello_servants.cpp
@@ -506,13 +506,13 @@ CORBA::Object_ptr
CIAO_HelloWorld_Servant::_get_component (ACE_ENV_SINGLE_ARG_DECL)
{
::Components::SessionContext_var sc =
- ::Components::SessionContext::_narrow (this->context_);
+ ::Components::SessionContext::_narrow (this->context_.in ());
if (! CORBA::is_nil(sc.in ()))
return sc->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
::Components::EntityContext_var ec =
- ::Components::EntityContext::_narrow (this->context_);
+ ::Components::EntityContext::_narrow (this->context_.in ());
if (! CORBA::is_nil(ec.in ()))
return ec->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -646,7 +646,7 @@ CIAO_HelloHome_Servant::create (ACE_ENV_SINGLE_ARG_DECL)
this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- CCM_HelloWorld_var hw = CCM_HelloWorld::_narrow (com
+ CCM_HelloWorld_var hw = CCM_HelloWorld::_narrow (com.in ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc
index 8c27531cf1b..3258f89bfe8 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc
@@ -5,19 +5,19 @@ project(Assembly_Manager): ciao_server, acexml {
depends += XML_Helpers
Source_Files {
+ Assembly_ServiceC.cpp
+ Assembly_ServiceS.cpp
Assembly_Impl.cpp
Assembly_Visitors.cpp
Deployment_Configuration.cpp
Assembly_Manager.cpp // Main
Assembly_Service_Impl.cpp
- Assembly_ServiceC.cpp
- Assembly_ServiceS.cpp
}
}
project(Assembly_Deployer) : ciao_server {
Source_Files {
- Assembly_Deployer.cpp
Assembly_ServiceC.cpp
+ Assembly_Deployer.cpp
}
} \ No newline at end of file
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
index 9a8bb8057ed..08f452d843f 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
@@ -201,6 +201,11 @@ CIAO::Assembly_Impl::build (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG, "------------------------------------\n"));
+ if (build_result != 0)
+ {
+ ACE_ERROR ((LM_ERROR, "Failed to install all homes or instantiate all components\n"));
+ ACE_THROW (Components::CreateFailure ());
+ }
// Setting connections
CIAO::Assembly_Spec::CONNECTION_QUEUE::ITERATOR
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp
index 054463da46b..cc7d08f22e0 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp
@@ -133,9 +133,9 @@ main (int argc, char *argv[])
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- ::Components::Deployment::AssemblyFactory_var assembly_factory_obj =
- ::Components::Deployment::AssemblyFactory::_narrow (obj
- ACE_ENV_ARG_PARAMETER);
+ Components::Deployment::AssemblyFactory_var assembly_factory_obj =
+ Components::Deployment::AssemblyFactory::_narrow (obj.in ()
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (assembly_factory_obj.in ()))
@@ -184,7 +184,7 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
CIAO::Assembly_Service_var service_obj =
- CIAO::Assembly_Service::_narrow (obj
+ CIAO::Assembly_Service::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.h b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.h
index 6a9c57d4492..bf1ad209c79 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.h
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.h
@@ -128,7 +128,7 @@ namespace CIAO
}
#if defined (__ACE_INLINE__)
-# include "Assembly_Visitor.inl"
+# include "Assembly_Visitors.inl"
#endif /* __ACE_INLINE__ */
#include "ace/post.h"
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.inl b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.inl
index c825d29a509..dc8160a3ac4 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.inl
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.inl
@@ -1,5 +1,6 @@
// $Id$
+ACE_INLINE
CIAO::Assembly_Builder_Visitor::Assembly_Builder_Visitor (CORBA::ORB_ptr o,
Assembly_Context &context,
CIAO::ID_IMPL_MAP &idmap,
diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
index 16c1877b822..5040374b371 100644
--- a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
+++ b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
@@ -136,9 +136,9 @@ main (int argc, char *argv[])
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- ::Components::Deployment::ComponentServer_var comserv_obj =
- ::Components::Deployment::ComponentServer::_narrow (obj
- ACE_ENV_ARG_PARAMETER);
+ Components::Deployment::ComponentServer_var comserv_obj =
+ Components::Deployment::ComponentServer::_narrow (obj.in ()
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (comserv_obj.in ()))
diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp b/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp
index 4024f96a024..e0cbbd92500 100644
--- a/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp
+++ b/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp
@@ -95,7 +95,7 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Try removing a ComponentServer\n"));
- comserv->remove_container (container
+ comserv->remove_container (container.in ()
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
diff --git a/TAO/CIAO/tools/Daemon/controller_i.cpp b/TAO/CIAO/tools/Daemon/controller_i.cpp
index 77a427e74b5..54f515b4876 100644
--- a/TAO/CIAO/tools/Daemon/controller_i.cpp
+++ b/TAO/CIAO/tools/Daemon/controller_i.cpp
@@ -102,7 +102,7 @@ CIAO::Daemon_i::controller::init (int argc,
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
- this->daemon_ = CIAO::Daemon::_narrow (obj
+ this->daemon_ = CIAO::Daemon::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
diff --git a/TAO/CIAO/tools/Daemon/controller_i.h b/TAO/CIAO/tools/Daemon/controller_i.h
index a2a8d073352..2261ee9574c 100644
--- a/TAO/CIAO/tools/Daemon/controller_i.h
+++ b/TAO/CIAO/tools/Daemon/controller_i.h
@@ -13,7 +13,7 @@
#define CIAO_CONTROLLER_I_H
#include "ace/pre.h"
-#include "daemonC.h"
+#include "DaemonC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/CIAO/tools/ServerActivator/ServerActivator_test_client.cpp b/TAO/CIAO/tools/ServerActivator/ServerActivator_test_client.cpp
index c343a960b41..71e27431aff 100644
--- a/TAO/CIAO/tools/ServerActivator/ServerActivator_test_client.cpp
+++ b/TAO/CIAO/tools/ServerActivator/ServerActivator_test_client.cpp
@@ -140,7 +140,8 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
CORBA::String_var hior =
- orb->object_to_string (home ACE_ENV_ARG_PARAMETER);
+ orb->object_to_string (home.in ()
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
write_IOR (hior.in ());
@@ -151,7 +152,7 @@ main (int argc, char *argv[])
}
ACE_DEBUG ((LM_DEBUG, "Try removing a ComponentServer\n"));
- comserv->remove_container (container
+ comserv->remove_container (container.in ()
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
diff --git a/TAO/CIAO/tools/XML_Helpers/Assembly_Handlers.cpp b/TAO/CIAO/tools/XML_Helpers/Assembly_Handlers.cpp
index f64679e59c6..9b20004765d 100644
--- a/TAO/CIAO/tools/XML_Helpers/Assembly_Handlers.cpp
+++ b/TAO/CIAO/tools/XML_Helpers/Assembly_Handlers.cpp
@@ -7,9 +7,9 @@
#endif /* __ACE_INLINE__ */
void
-CIAO::Assembly_Handler::characters (const ACEXML_Char *cdata,
- int start,
- int len
+CIAO::Assembly_Handler::characters (const ACEXML_Char *,
+ int ,
+ int
ACEXML_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((ACEXML_SAXException))
{
@@ -252,6 +252,9 @@ CIAO::Comp_File_Handler::startElement (const ACEXML_Char *namespaceURI,
ACEXML_ENV_ARG_DECL)
ACE_THROW_SPEC ((ACEXML_SAXException))
{
+ ACE_UNUSED_ARG (namespaceURI);
+ ACE_UNUSED_ARG (localName);
+
ACE_TRACE ("CIAO::Comp_File_Handler::startElement");
++this->element_count_;
@@ -441,6 +444,9 @@ CIAO::Partitioning_Handler::startElement (const ACEXML_Char *namespaceURI,
ACEXML_ENV_ARG_DECL)
ACE_THROW_SPEC ((ACEXML_SAXException))
{
+ ACE_UNUSED_ARG (namespaceURI);
+ ACE_UNUSED_ARG (localName);
+
// We are assuming we have a working ACEXML validator.
ACE_TRACE ("CIAO::Partitioning_Handler::startElement");
@@ -764,6 +770,9 @@ CIAO::Connections_Handler::startElement (const ACEXML_Char *namespaceURI,
ACEXML_ENV_ARG_DECL)
ACE_THROW_SPEC ((ACEXML_SAXException))
{
+ ACE_UNUSED_ARG (namespaceURI);
+ ACE_UNUSED_ARG (localName);
+
ACE_TRACE ("CIAO::Connections_Handler::startElement");
++this->element_count_;
diff --git a/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.cpp b/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.cpp
index b56a81ba7d5..f0ce278f379 100644
--- a/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.cpp
+++ b/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.cpp
@@ -11,7 +11,7 @@
int
CIAO::Assembly_Placement::Node::accept
-(CIAO::Assembly_Placement::Visitor &visitor
+(CIAO::Assembly_Placement::Visitor &
ACE_ENV_ARG_DECL)
{
// This should have never gotten called.
diff --git a/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.inl b/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.inl
index 10af016a739..711fd5816ed 100644
--- a/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.inl
+++ b/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.inl
@@ -33,8 +33,8 @@ CIAO::Assembly_Placement::Node::id () const
ACE_INLINE
CIAO::Assembly_Placement::Container::Container (const char *id,
unsigned long cardinality)
- : cardinality_ (cardinality),
- CIAO::Assembly_Placement::Node (id)
+ : CIAO::Assembly_Placement::Node (id),
+ cardinality_ (cardinality)
{
}
diff --git a/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.cpp b/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.cpp
index 38ad8987337..e4fe356907b 100644
--- a/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.cpp
+++ b/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.cpp
@@ -112,14 +112,14 @@ CIAO::XMLHelpers::Skip_DocHandler::Skip_DocHandler (ACEXML_XMLReader *parser,
ACEXML_ENV_ARG_DECL)
ACE_THROW_SPEC ((ACEXML_SAXException))
// The exception stuff will not work for platform without native exception.
- : element_count_ (0),
- Cascadable_DocHandler (parser,
+ : Cascadable_DocHandler (parser,
parent,
namespaceURI,
localName,
qName,
attrs
- ACEXML_ENV_ARG_PARAMETER)
+ ACEXML_ENV_ARG_PARAMETER),
+ element_count_ (0)
{
}
@@ -148,10 +148,10 @@ CIAO::XMLHelpers::Skip_DocHandler::endElement (const ACEXML_Char *namespaceURI,
}
void
-CIAO::XMLHelpers::Skip_DocHandler::startElement (const ACEXML_Char *namespaceURI,
- const ACEXML_Char *localName,
- const ACEXML_Char *qName,
- ACEXML_Attributes *atts
+CIAO::XMLHelpers::Skip_DocHandler::startElement (const ACEXML_Char *,
+ const ACEXML_Char *,
+ const ACEXML_Char *,
+ ACEXML_Attributes *
ACEXML_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((ACEXML_SAXException))
{
diff --git a/TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.cpp b/TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.cpp
index ce5456963b7..e0b6d92bfed 100644
--- a/TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.cpp
+++ b/TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.cpp
@@ -55,6 +55,9 @@ CIAO::Softpkg_Handler::startElement (const ACEXML_Char *namespaceURI,
ACEXML_ENV_ARG_DECL)
ACE_THROW_SPEC ((ACEXML_SAXException))
{
+ ACE_UNUSED_ARG (namespaceURI);
+ ACE_UNUSED_ARG (localName);
+
switch (this->state_)
{
case ROOT: