summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CIAO/ChangeLog17
-rw-r--r--CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp18
-rw-r--r--CIAO/ciao/Servants/Connector_Servant_Impl_Base.h1
-rw-r--r--CIAO/ciao/Servants/Servant_Impl_Base.cpp1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp6
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTrip/client.cpp4
6 files changed, 32 insertions, 15 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 698acb52365..5fce580f0f2 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,20 @@
+Wed Apr 14 07:29:12 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ciao/Servants/Connector_Servant_Impl_Base.h:
+ Removed obsolete include
+
+ * ciao/Servants/Servant_Impl_Base.cpp:
+ Removed unneeded return after throw
+
+ * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
+ layout changes for debug message
+
+ * examples/DevGuideExamples/Messenger/Administrator_Client.cpp:
+ Don't use full CCM methods
+
+ * performance-tests/Benchmark/RoundTrip/client.cpp:
+ Const changes
+
Wed Apr 14 07:13:58 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/impl/dds/DDS_Listen_T.h:
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index fd227fdd6a9..736e267e923 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -147,7 +147,7 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
{
options.em_ior_ = get_opt.opt_arg ();
DANCE_DEBUG (6, (LM_DEBUG, DLINFO
- ACE_TEXT ("Plan_Launcher::parse_args -")
+ ACE_TEXT ("Plan_Launcher::parse_args - ")
ACE_TEXT ("Using ExecutionManager IOR: %s\n"),
options.em_ior_));
}
@@ -157,7 +157,7 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
options.nm_ior_ = get_opt.opt_arg ();
options.output_ = true;
DANCE_DEBUG (6, (LM_DEBUG, DLINFO
- ACE_TEXT ("Plan_Launcher::parse_args -")
+ ACE_TEXT ("Plan_Launcher::parse_args - ")
ACE_TEXT ("Using NodeManager IOR: %s\n"),
options.nm_ior_));
break;
@@ -165,7 +165,7 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
case 'x':
options.xml_plan_ = get_opt.opt_arg ();
DANCE_DEBUG (6, (LM_DEBUG, DLINFO
- ACE_TEXT ("Plan_Launcher::parse_args -")
+ ACE_TEXT ("Plan_Launcher::parse_args - ")
ACE_TEXT ("Using XML plan: %s\n"),
options.xml_plan_));
break;
@@ -173,7 +173,7 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
case 'c':
options.cdr_plan_ = get_opt.opt_arg ();
DANCE_DEBUG (6, (LM_DEBUG, DLINFO
- ACE_TEXT ("Plan_Launcher::parse_args -")
+ ACE_TEXT ("Plan_Launcher::parse_args - ")
ACE_TEXT ("Using CDR plan: %s\n"),
options.cdr_plan_));
break;
@@ -181,7 +181,7 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
case 'u':
options.uuid_ = get_opt.opt_arg ();
DANCE_DEBUG (6, (LM_DEBUG, DLINFO
- ACE_TEXT ("Plan_Launcher::parse_args -")
+ ACE_TEXT ("Plan_Launcher::parse_args - ")
ACE_TEXT ("Using UUID: %s\n"),
options.uuid_));
break;
@@ -189,7 +189,7 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
case 'm':
options.am_ior_ = get_opt.opt_arg ();
DANCE_DEBUG (6, (LM_DEBUG, DLINFO
- ACE_TEXT ("Plan_Launcher::parse_args -")
+ ACE_TEXT ("Plan_Launcher::parse_args - ")
ACE_TEXT ("Using ApplicationManager IOR %s\n"),
options.am_ior_));
break;
@@ -197,7 +197,7 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
case 'a':
options.app_ior_ = get_opt.opt_arg ();
DANCE_DEBUG (6, (LM_DEBUG, DLINFO
- ACE_TEXT ("Plan_Launcher::parse_args -")
+ ACE_TEXT ("Plan_Launcher::parse_args - ")
ACE_TEXT ("Application IOR: %s\n"),
options.app_ior_));
break;
@@ -205,14 +205,14 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
case 'l':
options.mode_ = Options::LAUNCH;
DANCE_DEBUG (6, (LM_DEBUG, DLINFO
- ACE_TEXT ("Plan_Launcher::parse_args -")
+ ACE_TEXT ("Plan_Launcher::parse_args - ")
ACE_TEXT ("Launching nominated plan\n")));
break;
case 's':
options.mode_ = Options::TEARDOWN;
DANCE_DEBUG (6, (LM_DEBUG, DLINFO
- ACE_TEXT ("Plan_Launcher::parse_args -")
+ ACE_TEXT ("Plan_Launcher::parse_args - ")
ACE_TEXT ("Tearing down nominated plan\n")));
break;
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
index b10ec4bb9fe..f8ff3bafdc0 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
@@ -32,7 +32,6 @@
#include "ccm/CCM_ObjectS.h"
#include "ccm/CCM_StandardConfiguratorC.h"
-#include "ace/Hash_Map_Manager_T.h"
#include "ace/Array_Map.h"
namespace CIAO
diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
index cd68e33d293..4fd9c8f2a85 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
@@ -219,7 +219,6 @@ namespace CIAO
port_name));
throw ::CORBA::BAD_PARAM ();
- return;
}
ConsumerTable::value_type entry;
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp
index 15378b35b78..1fb71909966 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp
@@ -105,8 +105,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
CORBA::Object_var obj = orb->string_to_object(ior);
Messenger_var messenger = Messenger::_narrow (obj.in());
- Runnable_var runnable = messenger->provide_control();
- Publication_var publication = messenger->provide_content ();
+ obj = messenger->provide_facet ("control");
+ Runnable_var runnable = Runnable::_narrow (obj.in ());
+ obj = messenger->provide_facet ("content");
+ Publication_var publication = Publication::_narrow (obj.in ());
svc( runnable.in(), publication.in() );
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index a365068b76f..d342d23a6cb 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -61,7 +61,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
void
set_priority ()
{
- int priority =
+ int const priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+ ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
// Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
@@ -115,7 +115,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// Get the RoundTrip reference
obj = test->provide_facet ("latency");
- Benchmark::LatencyTest_var round_trip =
+ Benchmark::LatencyTest_var round_trip =
Benchmark::LatencyTest::_narrow (obj.in ());
if (CORBA::is_nil (round_trip.in ()))
View Lorry Controller Status