From f26ca75e508af9588103e39f11270b6814aba377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= <stefantroger@gmx.de>
Date: Sun, 23 Jun 2013 12:17:11 +0200
Subject: [PATCH] msvc adaptions

---
 src/Mod/Assembly/App/opendcm/core.hpp            | 9 +++++++++
 src/Mod/Assembly/App/opendcm/module3d/solver.hpp | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Assembly/App/opendcm/core.hpp b/src/Mod/Assembly/App/opendcm/core.hpp
index c58af05a6..f9eacdf67 100644
--- a/src/Mod/Assembly/App/opendcm/core.hpp
+++ b/src/Mod/Assembly/App/opendcm/core.hpp
@@ -23,6 +23,15 @@
 #ifdef _WIN32
 	//warning about to long decoraded names, won't affect the code correctness
 	#pragma warning( disable : 4503 )
+
+	//disable boost concept checks, as some of them have alignment problems which bring msvc to an error
+	//(for example DFSvisitor check in boost::graph::depht_first_search)
+	//this has no runtime effect as these are only compile time checks
+	#include <boost/concept/assert.hpp>
+	#undef BOOST_CONCEPT_ASSERT
+	#define BOOST_CONCEPT_ASSERT(Model)
+	#include <boost/concept_check.hpp>
+
 #endif
 
 #include "core/geometry.hpp"
diff --git a/src/Mod/Assembly/App/opendcm/module3d/solver.hpp b/src/Mod/Assembly/App/opendcm/module3d/solver.hpp
index edc8a6595..31823a109 100644
--- a/src/Mod/Assembly/App/opendcm/module3d/solver.hpp
+++ b/src/Mod/Assembly/App/opendcm/module3d/solver.hpp
@@ -402,7 +402,7 @@ void SystemSolver<Sys>::solveCluster(boost::shared_ptr<Cluster> cluster, Sys& sy
                         DummyScaler re;
                         Kernel::solve(mes, re);
                         done=true;
-                    } catch(boost::exception& e) {
+                    } catch(boost::exception& ) {
                         //not successful, so we need brute force
                         done = false;
                     }
@@ -447,7 +447,7 @@ void SystemSolver<Sys>::solveCluster(boost::shared_ptr<Cluster> cluster, Sys& sy
         //we have solved this cluster
         cluster->template setClusterProperty<changed_prop>(false);
 
-    } catch(boost::exception& x) {
+    } catch(boost::exception& ) {
         throw;
     }
 };