From d01d155ff9a1e95bb5c27b67bb351737c4298fdb Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 16 Mar 2003 22:00:42 +0000 Subject: [PATCH] Fixes for new beta release of VS.NET --- src/osgUtil/TriStrip_graph_array.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/osgUtil/TriStrip_graph_array.h b/src/osgUtil/TriStrip_graph_array.h index c5a3e005d..633e0e15f 100644 --- a/src/osgUtil/TriStrip_graph_array.h +++ b/src/osgUtil/TriStrip_graph_array.h @@ -253,7 +253,7 @@ inline void graph_array::setsize(const size_t NbNodes) { template -inline graph_array::node & graph_array::operator [] (const nodeid & i) { +inline typename graph_array::node & graph_array::operator [] (const nodeid & i) { // Debug check assert(i < size()); @@ -262,7 +262,7 @@ inline graph_array::node & graph_array::op template -inline const graph_array::node & graph_array::operator [] (const nodeid & i) const { +inline const typename graph_array::node & graph_array::operator [] (const nodeid & i) const { // Debug check assert(i < size()); @@ -271,49 +271,49 @@ inline const graph_array::node & graph_array -inline graph_array::node_iterator graph_array::begin() { +inline typename graph_array::node_iterator graph_array::begin() { return m_Nodes.begin(); } template -inline graph_array::node_iterator graph_array::end() { +inline typename graph_array::node_iterator graph_array::end() { return m_Nodes.end(); } template -inline graph_array::const_node_iterator graph_array::begin() const { +inline typename graph_array::const_node_iterator graph_array::begin() const { return m_Nodes.begin(); } template -inline graph_array::const_node_iterator graph_array::end() const { +inline typename graph_array::const_node_iterator graph_array::end() const { return m_Nodes.end(); } template -inline graph_array::node_reverse_iterator graph_array::rbegin() { +inline typename graph_array::node_reverse_iterator graph_array::rbegin() { return m_Nodes.rbegin(); } template -inline graph_array::node_reverse_iterator graph_array::rend() { +inline typename graph_array::node_reverse_iterator graph_array::rend() { return m_Nodes.rend(); } template -inline graph_array::const_node_reverse_iterator graph_array::rbegin() const { +inline typename graph_array::const_node_reverse_iterator graph_array::rbegin() const { return m_Nodes.rbegin(); } template -inline graph_array::const_node_reverse_iterator graph_array::rend() const { +inline typename graph_array::const_node_reverse_iterator graph_array::rend() const { return m_Nodes.rend(); } @@ -325,19 +325,19 @@ inline size_t graph_array::number_of_arcs() const { template -inline graph_array::out_arc_iterator graph_array::insert_arc(const nodeid & Initial, const nodeid & Terminal) { +inline typename graph_array::out_arc_iterator graph_array::insert_arc(const nodeid & Initial, const nodeid & Terminal) { return (insert(begin() + Initial, begin() + Terminal)); } template -inline graph_array::out_arc_iterator graph_array::insert_arc(const nodeid & Initial, const nodeid & Terminal, const arctype & Elem) { +inline typename graph_array::out_arc_iterator graph_array::insert_arc(const nodeid & Initial, const nodeid & Terminal, const arctype & Elem) { return (insert(begin() + Initial, begin() + Terminal, Elem)); } template -inline graph_array::out_arc_iterator graph_array::insert_arc(const node_iterator & Initial, const node_iterator & Terminal) { +inline typename graph_array::out_arc_iterator graph_array::insert_arc(const node_iterator & Initial, const node_iterator & Terminal) { ++m_NbArcs; Initial->m_OutArcs.push_back(arc(Initial, Terminal)); return (--(Initial->m_OutArcs.end())); @@ -345,7 +345,7 @@ inline graph_array::out_arc_iterator graph_array -inline graph_array::out_arc_iterator graph_array::insert_arc(const node_iterator & Initial, const node_iterator & Terminal, const arctype & Elem) { +inline typename graph_array::out_arc_iterator graph_array::insert_arc(const node_iterator & Initial, const node_iterator & Terminal, const arctype & Elem) { ++m_NbArcs; Initial->m_OutArcs.push_back(arc(Initial, Terminal, Elem)); return (--(Initial->m_OutArcs.end())); @@ -353,7 +353,7 @@ inline graph_array::out_arc_iterator graph_array -inline graph_array::out_arc_iterator graph_array::erase_arc(const out_arc_iterator & Pos) { +inline typename graph_array::out_arc_iterator graph_array::erase_arc(const out_arc_iterator & Pos) { --m_NbArcs; return (Pos->initial()->m_OutArcs.erase(Pos)); }