Mon Nov 24 20:08:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 56 insertions, 24 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 963ebb449ef..b2755f65971 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,31 @@
+Mon Nov 24 20:08:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Servants/Home_Servant_Impl_T.cpp:
+          Fixed compile error
+
+        * ciao/Servants/Port_Activator_T.cpp:
+        * ciao/Servants/Port_Activator_T.h:
+          Fixed signature deactivate
+
+        * DAnCE/NodeApplication/ComponentAttributesSetter.cpp:
+          Datatype/const changs
+
+        * DAnCE/NodeApplication/Name_Utilities.cpp:
+        * DAnCE/NodeApplication/Name_Utilities.h:
+          Unicode changes
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+          Layout changes
+
+        * DAnCE/RedirectionService/CCMObjectLocator.cpp:
+          Datatype changes
+
+        * DAnCE/tests/ObjectLocatorTest/srv_main.cpp:
+          Fixed compile error
+
+        * examples/Swapping/Sender/Sender_exec.h:
+          Fixed include
+
 Mon Nov 24 19:48:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ccm/ComponentServer/ComponentServer.mpc
diff --git a/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp b/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp
index 79b5acaa00d..46cc7f92ca2 100644
--- a/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp
+++ b/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp
@@ -47,7 +47,7 @@ ComponentAttributesSetter::SetComponentAttributes (ACE_CString /*componentName*/
 {
   DANCE_TRACE ("ComponentAttributesSetter::SetComponentAttributes");
 
-  for (unsigned int i = 0; i < prop.length(); i++)
+  for (CORBA::ULong i = 0; i < prop.length(); i++)
     {
       ACE_CString name = prop[i].name.in();
       // Ignore configuration properties, since attributes can't have . in them, this seems like a good method.
@@ -71,7 +71,7 @@ ComponentAttributesSetter::SetComponentAttributes (ACE_CString /*componentName*/
           req->invoke();
           CORBA::release (req);
         }
-      catch (const CORBA::BAD_OPERATION &e)
+      catch (const CORBA::BAD_OPERATION &)
         {
           DANCE_ERROR ((LM_WARNING, DLINFO
                         "ComponentAttributesSetter::SetComponentAttributes - "
diff --git a/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp b/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
index a3b12b6da9b..a22b0f9f791 100644
--- a/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
+++ b/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
@@ -10,7 +10,7 @@ namespace DAnCE
 {
   bool
   Name_Utilities::write_ior (const ACE_TCHAR *file,
-                             const ACE_TCHAR *ior)
+                             const char *ior)
   {
     FILE* ior_output_file_ = ACE_OS::fopen (file, "w");
     if (ior_output_file_)
@@ -25,7 +25,7 @@ namespace DAnCE
   }
   
   bool
-  Name_Utilities::bind_object (const ACE_TCHAR *name,
+  Name_Utilities::bind_object (const char *name,
                                CORBA::Object_ptr obj,
                                CosNaming::NamingContext_ptr ctx)
   {
@@ -50,7 +50,7 @@ namespace DAnCE
           {
             ctx->bind (nm, obj);
           }
-        catch (CosNaming::NamingContext::AlreadyBound &ex)
+        catch (const CosNaming::NamingContext::AlreadyBound &ex)
           {
             DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::bind_object - "
                           "Name %C already bound, rebinding....\n",
@@ -58,7 +58,7 @@ namespace DAnCE
             ctx->rebind (nm, obj);
           }
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         DANCE_ERROR ((LM_ERROR, DLINFO "Name_Utilities::bind_object - "
                       "Caught CORBA exception while attempting to bind name %C: %C\n",
@@ -105,7 +105,7 @@ namespace DAnCE
   }
   
   bool
-  Name_Utilities::unbind_object (const ACE_TCHAR *name, 
+  Name_Utilities::unbind_object (const char *name, 
                                  CosNaming::NamingContext_ptr ctx)
   {
     DANCE_TRACE ("Name_Utilities::unbind_object");
@@ -128,12 +128,12 @@ namespace DAnCE
   }
   
   void
-  Name_Utilities::build_name (const ACE_TCHAR *name,
+  Name_Utilities::build_name (const char *name,
                               CosNaming::Name &nm)
   {
     DANCE_TRACE ("Name_Utilities::build_name");
     
-    /*ACE_Auto_Basic_Array_Ptr<ACE_TCHAR>*/  ACE_TCHAR *safe_array (new ACE_TCHAR[ACE_OS::strlen (name)]);
+    /*ACE_Auto_Basic_Array_Ptr<ACE_TCHAR>*/  ACE_TCHAR *safe_array (new char[ACE_OS::strlen (name)]);
     
     ACE_Tokenizer parser (ACE_OS::strcpy (safe_array/*.get ()*/, name));
     parser.delimiter ('/');
diff --git a/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.h b/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.h
index c6fa11e1c87..5e75249a693 100644
--- a/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.h
+++ b/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.h
@@ -17,23 +17,23 @@ namespace DAnCE
   {
   public:
     /// Write IOR to named file.  Will overwrite file if present. 
-    static bool write_ior (const ACE_TCHAR *file, const ACE_TCHAR *ior);
+    static bool write_ior (const ACE_TCHAR *file, const char *ior);
     
     /// Binds object to provided name, which may be formatted with / to indicate
     /// naming contexts, e.g. A/B/C. 
-    static bool bind_object (const ACE_TCHAR *name, 
+    static bool bind_object (const char *name, 
                              CORBA::Object_ptr obj, 
                              CosNaming::NamingContext_ptr);
     
     /// Will unbind the provided name.  
-    static bool unbind_object (const ACE_TCHAR *name, 
+    static bool unbind_object (const char *name, 
                                CosNaming::NamingContext_ptr);
     
   private:
     static void bind_context (CosNaming::Name &nm,
                               CosNaming::NamingContext_ptr);
     
-    static void build_name (const ACE_TCHAR *nm,
+    static void build_name (const char *nm,
                             CosNaming::Name &);
     
   };
diff --git a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index aacef6ed4bf..0ef8d58bfd8 100644
--- a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -43,7 +43,9 @@ namespace
     if (properties.find (name, any) == 0)
       {
         if (any >>= val)
-          return true;
+		  {
+            return true;
+		  }
         else
           {
             DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - "
@@ -71,7 +73,9 @@ namespace
     if (properties.find (name, any) == 0)
       {
         if (any >>= CORBA::Any::to_boolean(val))
-          return true;
+		  {	 
+            return true;
+		  }
         else
           {
             DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - "
@@ -99,7 +103,9 @@ namespace
     if (properties.find (name, any) == 0)
       {
         if (any >>= CORBA::Any::to_string(val, 0))
-          return true;
+		  {
+            return true;
+		}
         else
           {
             DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<const char *> - "
diff --git a/flat/CIAO/DAnCE/RedirectionService/CCMObjectLocator.cpp b/flat/CIAO/DAnCE/RedirectionService/CCMObjectLocator.cpp
index 694de96ddc1..731033d635d 100644
--- a/flat/CIAO/DAnCE/RedirectionService/CCMObjectLocator.cpp
+++ b/flat/CIAO/DAnCE/RedirectionService/CCMObjectLocator.cpp
@@ -24,7 +24,7 @@ namespace DAnCE
                                            , mgr.in()
                                            , policies);
     DANCE_DEBUG ( (LM_DEBUG, "[%M] CCMObjectLocator::CCMObjectLocator - after create_POA\n"));
-    for (size_t i = 0; i < policies.length(); ++i)
+	for (CORBA::ULong i = 0; i < policies.length(); ++i)
       {
         policies[i]->destroy();
       }
diff --git a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp
index 68b2b48288b..7a8472930e2 100644
--- a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp
+++ b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp
@@ -14,8 +14,7 @@ int main (int argc, char * argv[])
 {
   try
     {
-      int argcm = argc + 2;
-      char * argvm[argcm+1];
+      char * argvm[argc+3];
       for (int i = 0; i < argc; ++i)
         {
           argvm[i] = argv[i];
diff --git a/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
index a75c1b94fc7..d62666350f1 100644
--- a/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
+++ b/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
@@ -209,8 +209,7 @@ namespace CIAO
   {
     CIAO_TRACE ("Home_Servant_Impl<>::_ciao_passivate_component");
 
-    PortableServer::ObjectId_var oid;
-    this->container_->uninstall_component (comp, oid.out ());
+    this->container_->uninstall_component (comp);
   }
 }
 
diff --git a/flat/CIAO/ciao/Servants/Port_Activator_T.cpp b/flat/CIAO/ciao/Servants/Port_Activator_T.cpp
index 73c218ae0b7..c46ba91e7ad 100644
--- a/flat/CIAO/ciao/Servants/Port_Activator_T.cpp
+++ b/flat/CIAO/ciao/Servants/Port_Activator_T.cpp
@@ -35,7 +35,7 @@ namespace CIAO
             typename COMP_SERV>
   void
   Port_Activator_T<SERV, EXEC, CONTEXT, COMP_SERV>::deactivate (
-      const PortableServer::Servant servant)
+      PortableServer::Servant servant)
   {
     SERVANT *s = dynamic_cast<SERVANT *> (servant);
     s->_remove_ref ();
diff --git a/flat/CIAO/ciao/Servants/Port_Activator_T.h b/flat/CIAO/ciao/Servants/Port_Activator_T.h
index 822fa4ac3d5..4e40d895e8e 100644
--- a/flat/CIAO/ciao/Servants/Port_Activator_T.h
+++ b/flat/CIAO/ciao/Servants/Port_Activator_T.h
@@ -54,7 +54,7 @@ namespace CIAO
     /// documentation for details.
     virtual PortableServer::Servant activate (const PortableServer::ObjectId &oid);
 
-    virtual void deactivate (const PortableServer::Servant servant);
+    virtual void deactivate (PortableServer::Servant servant);
 
   private:
     /// The executor
diff --git a/flat/CIAO/examples/Swapping/Sender/Sender_exec.h b/flat/CIAO/examples/Swapping/Sender/Sender_exec.h
index e1c4d4fc8bb..773777640ec 100644
--- a/flat/CIAO/examples/Swapping/Sender/Sender_exec.h
+++ b/flat/CIAO/examples/Swapping/Sender/Sender_exec.h
@@ -10,7 +10,7 @@
 #ifndef SENDER_EXEC_H
 #define SENDER_EXEC_H
 
-#include "ciao/CIAO_SwapExecC.h"
+#include "ciao/Servants/Swapping/CIAO_SwapExecC.h"
 #include "SenderEC.h"
 #include "Sender_exec_export.h"
 #include "tao/LocalObject.h"