From 8fc24fd8243f2dd5b9843ee6803fea21792efcfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= <stefantroger@gmx.de>
Date: Sat, 8 Jun 2013 22:44:31 +0200
Subject: [PATCH] remove loggin

---
 src/Mod/Assembly/App/CMakeLists.txt             | 14 +++++++-------
 src/Mod/Assembly/App/opendcm/core/geometry.hpp  |  4 ++--
 src/Mod/Assembly/App/opendcm/module3d/state.hpp |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt
index 7ca682440..54e58fa80 100644
--- a/src/Mod/Assembly/App/CMakeLists.txt
+++ b/src/Mod/Assembly/App/CMakeLists.txt
@@ -4,7 +4,7 @@ else(MSVC)
     add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)
 
-add_definitions( -DUSE_LOGGING )
+#add_definitions( -DUSE_LOGGING )
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/src
@@ -21,12 +21,12 @@ include_directories(
 
 )
 
-set(Assembly_LIBS
-    ${ODE_LIBRARIES}
-    ${OCC_LIBRARIES}
-    Part
-    FreeCADApp
-)
+#set(Assembly_LIBS
+#    ${ODE_LIBRARIES}
+#    ${OCC_LIBRARIES}
+#    Part
+#    FreeCADApp
+#)
 
 generate_from_xml(ItemPy)
 generate_from_xml(ItemAssemblyPy)
diff --git a/src/Mod/Assembly/App/opendcm/core/geometry.hpp b/src/Mod/Assembly/App/opendcm/core/geometry.hpp
index 38f30fcd0..131a2d24e 100644
--- a/src/Mod/Assembly/App/opendcm/core/geometry.hpp
+++ b/src/Mod/Assembly/App/opendcm/core/geometry.hpp
@@ -439,7 +439,7 @@ void Geometry<Sys, Derived, GeometrieTypeList, Dim>::finishCalculation() {
         //recalculate(1.); //remove scaling to get right global value
         m_global = m_rotated;
 #ifdef USE_LOGGING
-        BOOST_LOG(log) << "Finish cluster calculation: "<<m_global.transpose();
+        BOOST_LOG(log) << "Finish cluster calculation";
 #endif
     }
     //TODO:non cluster paramter scaling
@@ -447,7 +447,7 @@ void Geometry<Sys, Derived, GeometrieTypeList, Dim>::finishCalculation() {
         m_global = m_parameter;
         normalize();
 #ifdef USE_LOGGING
-        BOOST_LOG(log) << "Finish calculation: "<<m_global.transpose();
+        BOOST_LOG(log) << "Finish calculation";
 #endif
     };
     apply_visitor v(m_global);
diff --git a/src/Mod/Assembly/App/opendcm/module3d/state.hpp b/src/Mod/Assembly/App/opendcm/module3d/state.hpp
index ecec8108a..b50ff3e1b 100644
--- a/src/Mod/Assembly/App/opendcm/module3d/state.hpp
+++ b/src/Mod/Assembly/App/opendcm/module3d/state.hpp
@@ -89,7 +89,7 @@ struct get_weight {
 template<typename Vector, typename Weight>
 struct getWeightType {
   typedef typename mpl::find_if<Vector, boost::is_same<get_weight<mpl::_1>, Weight > >::type iter;
-  typedef typename mpl::deref<iter>::type type;
+  typedef typename mpl::if_< boost::is_same<iter, typename mpl::end<Vector>::type >, mpl::void_, typename mpl::deref<iter>::type>::type type;
 };
 
 typedef std::vector< fusion::vector2<std::string, std::string> > string_vec;
@@ -217,7 +217,7 @@ struct inject_set {
 };
 //spezialisation if no type in the typelist has the right weight
 template<>
-struct inject_set<mpl_::void_> {
+struct inject_set<mpl::void_> {
 
     template<typename Obj, typename Vec>
     static void apply(Vec& v, Obj g) {