kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

msvc and gcc/clang are not satisfiable with the same code...

Browse Source
This commit is contained in:
Stefan Troeger
2014-01-25 15:24:26 +01:00
committed by Stefan Tröger
parent 3b4db93332
commit 5ef6fb5dd5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp
View File

@@ -772,8 +772,11 @@ void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::setObject(key
template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects>
template<typename Obj>
std::pair< typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::object_iterator<Obj>, typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::object_iterator<Obj> >
ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::getObjects(LocalEdge k) {
#ifdef _MSC_VER
std::pair<typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::object_iterator<Obj>, typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::object_iterator<Obj> >
#elif
std::pair<typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::template object_iterator<Obj>, typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::template object_iterator<Obj> >
#endifClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::getObjects(LocalEdge k) {
std::vector<edge_bundle_single>& vec = fusion::at_c<1> ((*this) [k]);
object_iterator<Obj> begin(vec.begin(), object_extractor<Obj>());