From 5ef6fb5dd5f16a2c05e0808792b5aabc562592b5 Mon Sep 17 00:00:00 2001
From: Stefan Troeger <stefantroeger@gmx.net>
Date: Sat, 25 Jan 2014 15:24:26 +0100
Subject: [PATCH] msvc and gcc/clang are not satisfiable with the same code...

---
 src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp
index 9709f77572..5efa2d3809 100644
--- a/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp
+++ b/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp
@@ -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>());