diff --git a/include/boost/graph/adjacency_list.hpp b/include/boost/graph/adjacency_list.hpp index 6738fa22..d7fbc06d 100644 --- a/include/boost/graph/adjacency_list.hpp +++ b/include/boost/graph/adjacency_list.hpp @@ -329,7 +329,6 @@ namespace boost { : Base(num_vertices), m_property(new graph_property_type(p)) { } -#if !defined(BOOST_MSVC) || BOOST_MSVC >= 1300 // Required by Iterator Constructible Graph template adjacency_list(EdgeIterator first, EdgeIterator last, @@ -347,7 +346,6 @@ namespace boost { const GraphProperty& p = GraphProperty()) : Base(n, first, last, ep_iter), m_property(new graph_property_type(p)) { } -#endif void swap(adjacency_list& x) { // Is there a more efficient way to do this? diff --git a/include/boost/graph/adjacency_matrix.hpp b/include/boost/graph/adjacency_matrix.hpp index 65cf27a5..b1078d97 100644 --- a/include/boost/graph/adjacency_matrix.hpp +++ b/include/boost/graph/adjacency_matrix.hpp @@ -443,9 +443,7 @@ namespace boost { // graph type. Instead, use directedS, which also provides the // functionality required for a Bidirectional Graph (in_edges, // in_degree, etc.). -#if !defined(_MSC_VER) || _MSC_VER > 1300 BOOST_STATIC_ASSERT(type_traits::ice_not<(is_same::value)>::value); -#endif typedef typename mpl::if_::type @@ -480,13 +478,11 @@ namespace boost { typedef adjacency_matrix_traits Traits; public: -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // The bidirectionalS tag is not allowed with the adjacency_matrix // graph type. Instead, use directedS, which also provides the // functionality required for a Bidirectional Graph (in_edges, // in_degree, etc.). BOOST_STATIC_ASSERT(!(is_same::value)); -#endif typedef GraphProperty graph_property_type; typedef typename lookup_one_property::type graph_bundled; @@ -500,10 +496,9 @@ namespace boost { public: // should be private typedef typename mpl::if_::type, std::pair, char>::type StoredEdge; -#if (defined(BOOST_MSVC) && BOOST_MSVC <= 1300) || defined(BOOST_NO_STD_ALLOCATOR) +#if defined(BOOST_NO_STD_ALLOCATOR) typedef std::vector Matrix; #else - // This causes internal compiler error for MSVC typedef typename Allocator::template rebind::other Alloc; typedef std::vector Matrix; #endif diff --git a/include/boost/graph/graph_utility.hpp b/include/boost/graph/graph_utility.hpp index e772b640..f1f120e3 100644 --- a/include/boost/graph/graph_utility.hpp +++ b/include/boost/graph/graph_utility.hpp @@ -265,17 +265,7 @@ namespace boost { { typename graph_traits::adjacency_iterator vi, viend, found; boost::tie(vi, viend) = adjacent_vertices(a, g); -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 && defined(__SGI_STL_PORT) - // Getting internal compiler error with std::find() - found = viend; - for (; vi != viend; ++vi) - if (*vi == b) { - found = vi; - break; - } -#else found = std::find(vi, viend, b); -#endif if ( found == viend ) return false; @@ -283,17 +273,7 @@ namespace boost { out_found; boost::tie(oi, oiend) = out_edges(a, g); -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 && defined(__SGI_STL_PORT) - // Getting internal compiler error with std::find() - out_found = oiend; - for (; oi != oiend; ++oi) - if (target(*oi, g) == b) { - out_found = oi; - break; - } -#else out_found = std::find_if(oi, oiend, incident_to(b, g)); -#endif if (out_found == oiend) return false; return true; diff --git a/include/boost/graph/graphviz.hpp b/include/boost/graph/graphviz.hpp index aedce555..df10806c 100644 --- a/include/boost/graph/graphviz.hpp +++ b/include/boost/graph/graphviz.hpp @@ -289,8 +289,6 @@ namespace boost { BOOST_GRAPH_ENABLE_IF_MODELS_PARM(Graph,vertex_list_graph_tag)) { write_graphviz(out, g, vpw, epw, gpw, get(vertex_index, g)); } -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 - // ambiguous overload problem with VC++ template inline void write_graphviz(std::ostream& out, const Graph& g @@ -300,7 +298,6 @@ namespace boost { default_writer gw; write_graphviz(out, g, dw, dw, gw); } -#endif template inline void @@ -349,21 +346,7 @@ namespace boost { typename Graph::const_children_iterator i_child, j_child; //print graph/node/edge attributes -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 - typedef typename graph_property::type - GAttrMap; - typedef typename graph_property::type - NAttrMap; - typedef typename graph_property::type - EAttrMap; - GAttrMap gam = get_property(g, graph_graph_attribute); - NAttrMap nam = get_property(g, graph_vertex_attribute); - EAttrMap eam = get_property(g, graph_edge_attribute); - graph_attributes_writer writer(gam, nam, eam); - writer(out); -#else make_graph_attributes_writer(g)(out); -#endif //print subgraph for ( boost::tie(i_child,j_child) = g.children(); @@ -382,15 +365,7 @@ namespace boost { if ( vertex_marker[pos] ) { vertex_marker[pos] = false; out << escape_dot_string(pos); -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 - typedef typename property_map::const_type - VertexAttributeMap; - attributes_writer vawriter(get(vertex_attribute, - g.root())); - vawriter(out, v); -#else make_vertex_attributes_writer(g.root())(out, v); -#endif out << ";" << std::endl; } } @@ -403,14 +378,7 @@ namespace boost { edge_marker[pos] = false; out << escape_dot_string(get(vertex_id, u)) << " " << Traits::delimiter() << " " << escape_dot_string(get(vertex_id, v)); -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 - typedef typename property_map::const_type - EdgeAttributeMap; - attributes_writer eawriter(get(edge_attribute, g)); - eawriter(out, *ei); -#else make_edge_attributes_writer(g)(out, *ei); //print edge properties -#endif out << ";" << std::endl; } } diff --git a/include/boost/graph/properties.hpp b/include/boost/graph/properties.hpp index d540439e..0d1d3469 100644 --- a/include/boost/graph/properties.hpp +++ b/include/boost/graph/properties.hpp @@ -27,12 +27,6 @@ #include #include -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) -// Stay out of the way of the concept checking class -# define Graph Graph_ -# define RandomAccessContainer RandomAccessContainer_ -#endif - namespace boost { enum default_color_type { white_color, gray_color, green_color, red_color, black_color }; diff --git a/include/boost/graph/reverse_graph.hpp b/include/boost/graph/reverse_graph.hpp index e9027e3c..24eb1c7c 100644 --- a/include/boost/graph/reverse_graph.hpp +++ b/include/boost/graph/reverse_graph.hpp @@ -13,11 +13,6 @@ #include #include -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) -// Stay out of the way of the concept checking class -# define BidirectionalGraph BidirectionalGraph_ -#endif - namespace boost { struct reverse_graph_tag { }; diff --git a/include/boost/graph/visitors.hpp b/include/boost/graph/visitors.hpp index e4a614f3..120314f9 100644 --- a/include/boost/graph/visitors.hpp +++ b/include/boost/graph/visitors.hpp @@ -21,11 +21,6 @@ #include #include -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) -// Stay out of the way of the concept checking class -# define Graph Graph_ -#endif - namespace boost { // This is a bit more convenient than std::numeric_limits because @@ -123,16 +118,6 @@ namespace boost { detail::invoke_dispatch(vlist.first, x, g, IsSameTag()); invoke_visitors(vlist.second, x, g, tag); } -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 - template - inline void - invoke_visitors(base_visitor& vis, T x, Graph& g, Tag) { - typedef typename Visitor::event_filter Category; - typedef typename is_same::type IsSameTag; - Visitor& v = static_cast(vis); - detail::invoke_dispatch(v, x, g, IsSameTag()); - } -#else template inline void invoke_visitors(Visitor& v, T x, Graph& g, Tag) { @@ -140,7 +125,6 @@ namespace boost { typedef typename is_same::type IsSameTag; detail::invoke_dispatch(v, x, g, IsSameTag()); } -#endif //======================================================================== // predecessor_recorder @@ -313,9 +297,4 @@ namespace boost { } /* namespace boost */ -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) -// Stay out of the way of the concept checking class -# undef Graph -#endif - #endif