From 0bc11fcbf1a3f7662468cac318b7e41675d596ae Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 18 Jan 2003 09:44:12 +0000 Subject: [PATCH] From Eric Sokolowsky, Fix for IRIX build, adding typename into the graph_array to allow the compiler to leave instation of typedefs until required. --- src/osgUtil/TriStrip_graph_array.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/osgUtil/TriStrip_graph_array.h b/src/osgUtil/TriStrip_graph_array.h index 712f20947..866eb0b00 100644 --- a/src/osgUtil/TriStrip_graph_array.h +++ b/src/osgUtil/TriStrip_graph_array.h @@ -67,10 +67,10 @@ public: // New types typedef size_t nodeid; - typedef std::vector::iterator node_iterator; - typedef std::vector::const_iterator const_node_iterator; - typedef std::vector::reverse_iterator node_reverse_iterator; - typedef std::vector::const_reverse_iterator const_node_reverse_iterator; + typedef typename std::vector::iterator node_iterator; + typedef typename std::vector::const_iterator const_node_iterator; + typedef typename std::vector::reverse_iterator node_reverse_iterator; + typedef typename std::vector::const_reverse_iterator const_node_reverse_iterator; typedef graph_array _mytype; @@ -106,8 +106,8 @@ public: // New types - typedef std::list::iterator out_arc_iterator; - typedef std::list::const_iterator const_out_arc_iterator; + typedef typename std::list::iterator out_arc_iterator; + typedef typename std::list::const_iterator const_out_arc_iterator; // graph_array::node class @@ -205,7 +205,7 @@ template void unmark_nodes(graph_array & G); template -void unmark_arcs_from_node(graph_array::node & N); +void unmark_arcs_from_node(typename graph_array::node & N); template void unmark_arcs(graph_array & G); @@ -397,7 +397,7 @@ void unmark_nodes(graph_array & G) template -void unmark_arcs_from_node(graph_array::node & N) +void unmark_arcs_from_node(typename graph_array::node & N) { typedef graph_array::out_arc_iterator arc_it;