summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--TAO/tao/Adapter_Registry.cpp2
-rw-r--r--TAO/tao/BiDir_GIOP/BiDirGIOP.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp2
-rw-r--r--TAO/tao/Codeset/Codeset_Manager_i.cpp12
-rw-r--r--TAO/tao/Messaging/Messaging_Loader.cpp2
-rw-r--r--TAO/tao/ORB_Core.cpp2
-rw-r--r--TAO/tao/Object.cpp6
-rw-r--r--TAO/tao/PortableServer/Root_POA.cpp6
-rw-r--r--TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp2
10 files changed, 23 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 60670f736eb..db80f4aa736 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 24 08:41:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/wrapper_macros.GNU:
+ Pass RCFLAGS to the resource compiler
+
Mon Oct 24 08:37:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_unistd.{h,inl}:
diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
index 0f154f49f01..e55792bc2a5 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -50,7 +50,7 @@ TAO_Adapter_Registry::close (int wait_for_completion
if (TAO_debug_level > 3)
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "Exception in TAO_Adapter_Registry::close () \n");
+ "Exception in TAO_Adapter_Registry::close ()");
}
return;
}
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 033371ec5bb..dc4912f8d21 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -58,7 +58,7 @@ TAO_BiDirGIOP_Loader::init (int,
if (TAO_debug_level > 0)
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "(%P | %t) Caught exception:");
+ "Caught exception:");
}
return -1;
}
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
index 7943eda6a5d..75e57a3ff93 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
@@ -75,7 +75,7 @@ TAO_CSD_Object_Adapter_Factory::init (int /* argc */,
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "(%P | %t) Caught exception:");
+ "Caught exception:");
return -1;
}
ACE_ENDTRY;
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 5973b0caedc..14ab1310459 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -98,7 +98,7 @@ void
TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile,
TAO_Transport &trans)
{
- /// If tcs is already set on the transport then donot process,
+ /// If tcs is already set on the transport then do not process,
/// use existing transport as CDR have translators set.
TAO_Tagged_Components& theTaggedComp = theProfile.tagged_components ();
@@ -120,8 +120,8 @@ TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile,
ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::set_tcs, ")
ACE_TEXT ("No codeset component in profile\n")));
- // These are the "fallback" codeset ids for use if no context is
- // available
+ // These are the "fallback" codeset ids for use if no context is
+ // available
remote.ForCharData.native_code_set =
TAO_CODESET_ID_XOPEN_UTF_8;
remote.ForWcharData.native_code_set =
@@ -255,7 +255,7 @@ TAO_Codeset_Manager_i::generate_service_context (TAO_Operation_Details &opd,
/// Checks whether the NCS is a part of CCS
int
TAO_Codeset_Manager_i::isElementOf (CONV_FRAME::CodeSetId id,
- CONV_FRAME::CodeSetComponent &cs_comp)
+ CONV_FRAME::CodeSetComponent &cs_comp)
{
for (CORBA::ULong i = 0L;
i < cs_comp.conversion_code_sets.length ();
@@ -271,7 +271,7 @@ TAO_Codeset_Manager_i::isElementOf (CONV_FRAME::CodeSetId id,
/// Find the Intersection of Client and Server CCS's
CONV_FRAME::CodeSetId
TAO_Codeset_Manager_i::intersectionOf (CONV_FRAME::CodeSetComponent &cs_comp1,
- CONV_FRAME::CodeSetComponent &cs_comp2)
+ CONV_FRAME::CodeSetComponent &cs_comp2)
{
for(CORBA::ULong index = 0L;
index < cs_comp1.conversion_code_sets.length();
@@ -288,7 +288,7 @@ TAO_Codeset_Manager_i::intersectionOf (CONV_FRAME::CodeSetComponent &cs_comp1,
int
TAO_Codeset_Manager_i::isCompatible(CONV_FRAME::CodeSetId cs1,
- CONV_FRAME::CodeSetId cs2 )
+ CONV_FRAME::CodeSetId cs2 )
{
// Call the is_compatible method of ACE_Codeset_Registry
return ACE_Codeset_Registry::is_compatible(cs1,cs2);
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index f823aabd690..61cd1f282bd 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -61,7 +61,7 @@ TAO_Messaging_Loader::init (int,
if (TAO_debug_level > 0)
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "(%P | %t) Caught exception:");
+ "Caught exception:");
}
return -1;
}
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index ab815970d28..946aeb55f14 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -2921,7 +2921,7 @@ TAO_ORB_Core::ior_interceptor_adapter (void)
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "(%P|%t) Cannot initialize the "
+ "Cannot initialize the "
"ior_interceptor_adapter \n");
}
ACE_ENDTRY;
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 14ed6f02fa3..22a29290790 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -805,9 +805,9 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
{
if (TAO_debug_level > 0)
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- ACE_TEXT ("TAO (%P|%t) ERROR creating stub ")
+ ACE_TEXT ("TAO - ERROR creating stub ")
ACE_TEXT ("object when demarshaling object ")
- ACE_TEXT ("reference.\n"));
+ ACE_TEXT ("reference."));
return;
}
@@ -941,7 +941,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
{
if (TAO_debug_level > 0)
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- ACE_TEXT ("TAO (%P|%t) ERROR creating stub ")
+ ACE_TEXT ("TAO - ERROR creating stub ")
ACE_TEXT ("object when demarshaling object ")
ACE_TEXT ("reference.\n"));
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 7ff329f3a3f..68e49420e34 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -823,7 +823,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
this->cleanup_in_progress_ = 1;
// Inform the custom servant dispatching strategy to stop the working
- // threads when the poa is destroyed.
+ // threads when the poa is destroyed.
this->poa_deactivated_hook ();
// This operation destroys the POA and all descendant POAs. The POA
@@ -2518,8 +2518,8 @@ TAO_Root_POA::ORT_adapter_i (void)
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "(%P|%t) Cannot initialize the "
- "object_reference_template_adapter\n");
+ "Cannot initialize the "
+ "object_reference_template_adapter");
}
ACE_ENDTRY;
ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 0d19a6d1b46..c35399484d6 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -358,7 +358,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
{
// Eat up the exception.
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "Exception caught: TAO (%P|%t) - "
+ "Exception caught: TAO - "
"Priority_Model_Processing::"
"~Priority_Model_Processing");
}
View Lorry Controller Status