Mon Dec 17 18:49:30 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/ndds/Condition.cpp:
        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp:
        * connectors/dds4ccm/impl/ndds/DataWriter.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h:
        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp:
        * connectors/dds4ccm/impl/ndds/WaitSet.cpp:
          Don't include ndds_cpp.h as first include, fixes problems
          with msvc release mode compilation

7 files changed, 18 insertions, 10 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 7714db7a7b9..13e83578e1f 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Mon Dec 17 18:49:30 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/Condition.cpp:
+        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp:
+        * connectors/dds4ccm/impl/ndds/DataWriter.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h:
+        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp:
+        * connectors/dds4ccm/impl/ndds/WaitSet.cpp:
+          Don't include ndds_cpp.h as first include, fixes problems
+          with msvc release mode compilation
+
 Mon Dec 17 10:14:59 UTC 2012  Marcel Smit  <msmit@remedy.nl>
 
         * tests/Bug_3769_Regression/Foo_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp
index d8fcb35c29e..d2737fc95de 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp
@@ -1,9 +1,8 @@
 // $Id$
 
 #include "Condition.h"
-
-#include "ndds/ndds_cpp.h"
 #include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
index eccdf9bbfd7..739ec4576dd 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "ndds/ndds_cpp.h"
 #include "dds4ccm/impl/ndds/ContentFilteredTopic.h"
 #include "dds4ccm/impl/ndds/Topic.h"
 #include "dds4ccm/impl/logger/Log_Macros.h"
 #include "dds4ccm/impl/ndds/convertors/StringSeq.h"
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
index fe949fea9e5..39fcc25ad07 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "ndds/ndds_cpp.h"
 #include "dds4ccm/impl/ndds/DataWriter.h"
 #include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
index fb0f2746f20..99445dae5f8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
@@ -12,7 +12,7 @@
 
 #include "dds4ccm/idl/ndds/ndds_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
-# include "ndds/ndds_cpp.h"
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
index 572a0ab09e3..5b2edacb524 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ndds/ndds_cpp.h"
 #include "dds4ccm/impl/ndds/QueryCondition.h"
 #include "dds4ccm/impl/ndds/convertors/StringSeq.h"
 #include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
index 54087a21ad9..b8b3ff5a885 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
 #include "WaitSet.h"
-
-#include "ndds/ndds_cpp.h"
-
 #include "dds4ccm/impl/ndds/Condition.h"
 #include "dds4ccm/impl/ndds/QueryCondition.h"
 #include "dds4ccm/impl/ndds/ReadCondition.h"
 #include "dds4ccm/impl/ndds/convertors/Duration_t.h"
 #include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
 #include "dds4ccm/impl/Utils.h"
-
 #include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ndds/ndds_cpp.h"
+
 
 namespace CIAO
 {