Fri Dec 3 10:20:22 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
          Use DDS as sequence prefix for OpenDDS

        * tao/RTCORBA/RT_Mutex.h:
        * tao/RTCORBA/RT_ORB.cpp:
        * tao/RTCORBA/RT_ORBInitializer.h:
        * tao/RTCORBA/RT_Policy_i.h:
        * tao/RTCORBA/RT_Protocols_Hooks.h:
        * tao/RTCORBA/RT_Service_Context_Handler.cpp:
        * tao/RTCORBA/RT_Stub.cpp:
          Layout changes

9 files changed, 49 insertions, 33 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4d478bcdb8d..42c99c16531 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,31 @@
+Fri Dec  3 10:20:22 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Use DDS as sequence prefix for OpenDDS
+
+        * tao/RTCORBA/RT_Mutex.h:
+        * tao/RTCORBA/RT_ORB.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.h:
+        * tao/RTCORBA/RT_Policy_i.h:
+        * tao/RTCORBA/RT_Protocols_Hooks.h:
+        * tao/RTCORBA/RT_Service_Context_Handler.cpp:
+        * tao/RTCORBA/RT_Stub.cpp:
+          Layout changes
+
+Fri Dec  3 10:17:31 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+
+        * tao/RTCORBA/RT_Mutex.h:
+        * tao/RTCORBA/RT_ORB.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.h:
+        * tao/RTCORBA/RT_Policy_i.h:
+        * tao/RTCORBA/RT_Protocols_Hooks.h:
+        * tao/RTCORBA/RT_Service_Context_Handler.cpp:
+        * tao/RTCORBA/RT_Stub.cpp:
+
+        * tests/IDL_Test/array.idl:
+
 Fri Dec  3 06:13:19 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
index 91a125ab775..7e7eff965df 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
@@ -270,6 +270,10 @@ be_visitor_connector_dds_exh::gen_dds_traits (AST_Decl *datatype)
         {
           os_ << "RTI";
         }
+      else if (the_dds_impl == BE_GlobalData::OPENDDS)
+        {
+          os_ << "DDS";
+        }
 
       os_ << "Seq dds_seq_type;" << be_nl
           << "typedef ::" << dt_name
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index 7520fb6386f..ae79bdf1be4 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -66,8 +66,7 @@ public:
    * if you're interested in writing maximally portable programs avoid
    * using this operation in your program designs.
    */
-  virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait
-                                   );
+  virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait);
 
   /// Returns the name of the mutex.
   virtual const char *name (void) const;
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index d590397f068..0dbdbb1ac68 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -208,8 +208,7 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                             CORBA::Boolean keep_alive,
                                             CORBA::Boolean dont_route,
                                             CORBA::Boolean no_delay,
-                                            CORBA::Boolean enable_network_priority
-                                            )
+                                            CORBA::Boolean enable_network_priority)
 {
   TAO_TCP_Protocol_Properties *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -293,8 +292,7 @@ TAO_RT_ORB::create_stream_control_protocol_properties (
                                                        CORBA::Boolean keep_alive,
                                                        CORBA::Boolean dont_route,
                                                        CORBA::Boolean no_delay,
-                                                       CORBA::Boolean enable_network_priority
-                                                       )
+                                                       CORBA::Boolean enable_network_priority)
 {
   TAO_StreamControl_Protocol_Properties *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -318,8 +316,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                RTCORBA::Priority default_priority,
                                CORBA::Boolean allow_request_buffering,
                                CORBA::ULong max_buffered_requests,
-                               CORBA::ULong max_request_buffer_size
-                               )
+                               CORBA::ULong max_request_buffer_size)
 {
   return this->tp_manager_->create_threadpool (stacksize,
                                                static_threads,
@@ -446,7 +443,6 @@ TAO_RT_ORB::orb_core (void) const
 int
 TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb)
 {
-  //
   // This method changes the scheduling policy of the calling thread
   // to match the scheduling policy specified in the svc.conf file.
   // The priority of the calling thread will be set to the minimum
@@ -460,7 +456,6 @@ TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb)
   // created.  On such platforms, one can set the correct scheduling
   // scope and policy when creating the thread, thus not needing to
   // use this method.
-  //
 
 #if defined (linux)
 
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index 4ed80a2ec75..105be957f82 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -57,7 +57,7 @@ public:
       TAO_NETWORK_PRIORITY_MAPPING_LINEAR
     };
 
-  /*
+  /**
    * Lifespan of the dynamic threads
    * TAO_RTCORBA_DT_INFINITIVE When the Dynamic Thread is created it will run
    * forever
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index dd3c59b0b4a..4a47be72b9e 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -34,7 +34,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index 4cae8d8aab1..5ff1cc3d669 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -44,8 +44,7 @@ public:
   virtual ~TAO_RT_Protocols_Hooks (void);
 
   /// Initialize the protocols hooks instance.
-  void init_hooks (TAO_ORB_Core *orb_core
-                  );
+  void init_hooks (TAO_ORB_Core *orb_core);
 
   CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
                                               TAO_Stub *stub);
@@ -53,23 +52,17 @@ public:
   CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
                                               CORBA::Policy *policy);
 
-  void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                               );
+  void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties);
 
-  void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                               );
+  void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties);
 
-  void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                               );
+  void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties);
 
-  void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                               );
+  void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties);
 
-  void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                               );
+  void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties);
 
-  void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                               );
+  void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties);
 
   void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties);
 
@@ -108,17 +101,14 @@ public:
 
   int set_thread_CORBA_priority (CORBA::Short);
 
-  int restore_thread_CORBA_and_native_priority (CORBA::Short,
-                                                CORBA::Short);
-
+  int restore_thread_CORBA_and_native_priority (CORBA::Short, CORBA::Short);
   //@}
 
 protected:
   int set_thread_native_priority (CORBA::Short);
 
   RTCORBA::ProtocolProperties_ptr server_protocol_properties (IOP::ProfileId protocol_tag,
-                                                              CORBA::Policy_ptr policy
-                                                             );
+                                                              CORBA::Policy_ptr policy);
 
   RTCORBA::ProtocolProperties_ptr client_protocol_properties (IOP::ProfileId protocol_tag,
                                                               CORBA::Policy_ptr policy);
diff --git a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp
index 84df66adb71..a16075793e1 100644
--- a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp
+++ b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp
@@ -64,7 +64,7 @@ TAO_RT_Service_Context_Handler::generate_service_context (
               else
                 {
                   if (TAO_debug_level > 0)
-                    ACE_DEBUG ((LM_DEBUG, "ERROR: TAO_RT_Protocols_Hooks::rt_service_context. "
+                    ACE_ERROR ((LM_ERROR, "ERROR: TAO_RT_Protocols_Hooks::rt_service_context. "
                                 "Unable to access RT CORBA Priority in client thread "
                                 "accessing object with CLIENT_PROPAGATED priority model.\n"));
                   throw CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index 772d5d0dba4..20788468ad5 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -52,7 +52,8 @@ TAO_RT_Stub::parse_policies (void)
         {
           case RTCORBA::PRIORITY_MODEL_POLICY_TYPE:
             {
-              this->exposed_priority_model (policy_list[i]);            }
+              this->exposed_priority_model (policy_list[i]);
+            }
             break;
           case RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE :
             {