suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msvc adaptions

Browse Source
This commit is contained in:
Stefan Tröger 2013-06-23 12:17:11 +02:00 committed by Stefan Tröger
parent 02311333b9
commit f26ca75e50
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mod/Assembly/App/opendcm/core.hpp
View File

@ -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"

4
src/Mod/Assembly/App/opendcm/module3d/solver.hpp
View File

@ -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;
}
};