Fri Nov 26 07:42:34 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl:
        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl:
          Added typesupport pragma's

        * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc:
          _T must be a template file

        * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h:
          Include cpp file here

5 files changed, 27 insertions, 8 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index df3f83b58dc..5bc8d534a5a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Fri Nov 26 07:42:34 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl:
+        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl:
+          Added typesupport pragma's
+
+        * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc:
+          _T must be a template file
+
+        * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h:
+          Include cpp file here
+
 Thu Nov 25 19:57:29 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
index e7f9e4f3810..fb3b06af770 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
@@ -3,6 +3,8 @@
 #ifndef OFM_BASE_IDL
 #define OFM_BASE_IDL
 
+#pragma ndds typesupport "OFM_BaseSupport.h"
+
 struct Topic1 {
   string key_value_topic1; //@key
   long long_value;
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
index 2255972c08d..b8e58573eb4 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
@@ -8,6 +8,8 @@
 #ifndef ONEFILE_BASE_IDL_
 #define ONEFILE_BASE_IDL_
 
+#pragma ndds typesupport "OneFile_BaseSupport.h"
+
 struct OneFileTopic {
   string hello; //@key
   long iteration;
diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc
index 694476ffffb..fb78f996d39 100644
--- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc
+++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc
@@ -13,8 +13,8 @@ project(NT_Base_idl_gen) : componentidldefaults, anytypecode {
 }
 
 project(NT_Base_stub) : ccm_stub   {
-  after += NT_Base_idl_gen 
-  libs  += 
+  after += NT_Base_idl_gen
+  libs  +=
   sharedname = NT_Base_stub
   dynamicflags += NONTOPIC_BASE_STUB_BUILD_DLL
 
@@ -48,8 +48,8 @@ project(NT_test_idl_gen) : componentidldefaults, anytypecode {
 }
 
 project(NT_Test_stub) : ccm_stub {
-  after += NT_test_idl_gen 
-  libs  += 
+  after += NT_test_idl_gen
+  libs  +=
   sharedname = NT_Test_stub
   dynamicflags += NONTOPIC_TEST_STUB_BUILD_DLL
 
@@ -131,7 +131,7 @@ project(NT_Connector_lem_stub) : ccm_svnt {
 
 project(NT_Connector_stub) : ccm_stub {
   after += NT_Connector_lem_gen
-  libs  += 
+  libs  +=
   includes += ..
   sharedname = NonTopic_Connector_stub
   dynamicflags += NONTOPIC_CONNECTOR_STUB_BUILD_DLL
@@ -156,7 +156,7 @@ project(NT_Connector_stub) : ccm_stub {
 project(NT_Connector_skel) : ciao_executor {
   after += NT_Connector_stub
   libs  += NonTopic_Connector_stub
- 
+
   sharedname = NonTopic_Connector_skel
   dynamicflags += NONTOPIC_CONNECTOR_SKEL_BUILD_DLL
 
@@ -191,6 +191,9 @@ project(NT_Connector_exec) : ciao_executor {
 
   Source_Files {
     NonTopic_Connector_conn.cpp
+  }
+
+  Template_Files {
     NonTopic_Connector_T.cpp
   }
 
diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h
index 55efef6f676..b91c5f28bce 100644
--- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h
+++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h
@@ -3,8 +3,6 @@
 #ifndef NT_CONNECTOR_T
 #define NT_CONNECTOR_T
 
-#include "NonTopic_ConnectorEC.h"
-
 // connector template for Typed_NonTopic_Test_1
 template <typename CCM_TYPE, typename T, bool FIXED_T,
                                typename U, bool FIXED_U,
@@ -48,4 +46,6 @@ public:
    virtual void ccm_passivate (void);
 };
 
+#include "NonTopic_Connector_T.cpp"
+
 #endif