diff options
Diffstat (limited to 'math')
21 files changed, 14 insertions, 491 deletions
diff --git a/math/graphthing/Makefile b/math/graphthing/Makefile index 7fb178a7762e..56553d436473 100644 --- a/math/graphthing/Makefile +++ b/math/graphthing/Makefile @@ -7,9 +7,9 @@ # PORTNAME= graphthing -PORTVERSION= 0.7 +PORTVERSION= 0.9.1 CATEGORIES= math -MASTER_SITES= http://members.optushome.com.au/davidsymonds/gt/ +MASTER_SITES= http://graph.seul.org/ MAINTAINER= ports@FreeBSD.org COMMENT= A tool that allows you to create, manipulate and study graphs @@ -18,11 +18,12 @@ LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- USE_BISON= yes +USE_BZIP2= yes USE_GNOMENG= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS= --without-included-gettext \ +CONFIGURE_ARGS= --without-included-gettext .include <bsd.port.mk> diff --git a/math/graphthing/distinfo b/math/graphthing/distinfo index 7158371e910b..6dae6293ab94 100644 --- a/math/graphthing/distinfo +++ b/math/graphthing/distinfo @@ -1 +1 @@ -MD5 (graphthing-0.7.tar.gz) = 935d840a1c0bfdc1b5bcabb74832d2e7 +MD5 (graphthing-0.9.1.tar.bz2) = e2e3b4116a8080e81ef9bbd32b677de5 diff --git a/math/graphthing/files/patch-Makefile.in b/math/graphthing/files/patch-Makefile.in deleted file mode 100644 index 568d7fa87281..000000000000 --- a/math/graphthing/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Wed May 1 14:00:12 2002 -+++ Makefile.in Wed May 1 14:00:22 2002 -@@ -3,7 +3,7 @@ - PACKAGE = @PACKAGE@ - VERSION = @GT_VERSION@ - --SUBDIRS = intl src po -+SUBDIRS = src po - - DISTFILES = COPYING ChangeLog Makefile.in README TODO aclocal.m4 \ - configure configure.in install-sh mkinstalldirs version diff --git a/math/graphthing/files/patch-aclocal.m4 b/math/graphthing/files/patch-aclocal.m4 deleted file mode 100644 index 306327b6fe65..000000000000 --- a/math/graphthing/files/patch-aclocal.m4 +++ /dev/null @@ -1,20 +0,0 @@ ---- aclocal.m4.orig Wed May 1 14:15:28 2002 -+++ aclocal.m4 Wed May 1 14:16:29 2002 -@@ -290,7 +290,7 @@ - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib -- INTLDEPS='$(top_builddir)/intl/libintl.a' -+ dnl INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h -@@ -319,7 +319,7 @@ - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share -- INTLDEPS='$(top_builddir)/intl/libintl.a' -+ dnl INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h diff --git a/math/graphthing/files/patch-configure b/math/graphthing/files/patch-configure deleted file mode 100644 index 63be3956865c..000000000000 --- a/math/graphthing/files/patch-configure +++ /dev/null @@ -1,77 +0,0 @@ ---- configure.orig Fri Apr 5 02:55:27 2002 -+++ configure Wed May 1 14:19:00 2002 -@@ -2199,7 +2199,7 @@ - #include "confdefs.h" - #include <libintl.h> - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+ac_try="$ac_cpp -I/usr/local/include conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:2204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then -@@ -2780,7 +2780,6 @@ - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib -- INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h -@@ -2909,7 +2908,6 @@ - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share -- INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h -@@ -3964,49 +3962,6 @@ - ac_dests="$nls_cv_header_intl" - EOF - --cat >> $CONFIG_STATUS <<\EOF --srcdir=$ac_given_srcdir --while test -n "$ac_sources"; do -- set $ac_dests; ac_dest=$1; shift; ac_dests=$* -- set $ac_sources; ac_source=$1; shift; ac_sources=$* -- -- echo "linking $srcdir/$ac_source to $ac_dest" -- -- if test ! -r $srcdir/$ac_source; then -- { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; } -- fi -- rm -f $ac_dest -- -- # Make relative symlinks. -- # Remove last slash and all that follows it. Not all systems have dirname. -- ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'` -- if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then -- # The dest file is in a subdirectory. -- test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir" -- ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`" -- # A "../" for each directory in $ac_dest_dir_suffix. -- ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'` -- else -- ac_dest_dir_suffix= ac_dots= -- fi -- -- case "$srcdir" in -- [/$]*) ac_rel_source="$srcdir/$ac_source" ;; -- *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; -- esac -- -- # Make a symlink if possible; otherwise try a hard link. -- if ln -s $ac_rel_source $ac_dest 2>/dev/null || -- ln $srcdir/$ac_source $ac_dest; then : -- else -- { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; } -- fi --done --EOF --cat >> $CONFIG_STATUS <<EOF -- -- --EOF - cat >> $CONFIG_STATUS <<\EOF - case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile diff --git a/math/graphthing/files/patch-configure.in b/math/graphthing/files/patch-configure.in deleted file mode 100644 index f71c0292b62f..000000000000 --- a/math/graphthing/files/patch-configure.in +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.in.orig Wed May 1 14:03:01 2002 -+++ configure.in Wed May 1 14:03:13 2002 -@@ -63,7 +63,6 @@ - # Write stuff to Makefiles - AC_OUTPUT(Makefile - src/Makefile -- intl/Makefile - po/Makefile.in) - - # If they've turned on Developer Flags, give a warning diff --git a/math/graphthing/files/patch-matrix.h b/math/graphthing/files/patch-matrix.h deleted file mode 100644 index 04968852aa95..000000000000 --- a/math/graphthing/files/patch-matrix.h +++ /dev/null @@ -1,17 +0,0 @@ ---- src/matrix.h.orig Thu Nov 28 05:36:37 2002 -+++ src/matrix.h Thu Nov 28 05:40:53 2002 -@@ -24,12 +24,13 @@ - ~MatrixRep (); - }; - -- MatrixRep *rep; - - void unref (); - void mutator (); - - public: -+ MatrixRep *rep; -+ - Matrix (unsigned int _rows, unsigned int _columns); - Matrix (const Matrix &other); - ~Matrix (); diff --git a/math/graphthing/files/patch-src-Makefile.in b/math/graphthing/files/patch-src-Makefile.in deleted file mode 100644 index 103211b92f77..000000000000 --- a/math/graphthing/files/patch-src-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Wed May 1 14:13:07 2002 -+++ src/Makefile.in Wed May 1 14:13:17 2002 -@@ -7,7 +7,7 @@ - - DISTFILES = Makefile.in config.h.in depend.1 *.cc *.h *.y *.l *.gt - --INTL_INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -+INTL_INCLUDES = -DLOCALEDIR=\"$(localedir)\" - - CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ $(INTL_INCLUDES) - CXXFLAGS = @CXXFLAGS@ @EXTRA_CFLAGS@ \ diff --git a/math/graphthing/files/patch-src-edge.cc b/math/graphthing/files/patch-src-edge.cc deleted file mode 100644 index c658586159b4..000000000000 --- a/math/graphthing/files/patch-src-edge.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/edge.cc.orig Fri Oct 25 13:39:36 2002 -+++ src/edge.cc Fri Oct 25 13:40:19 2002 -@@ -13,7 +13,7 @@ - weight (wt), directed (dir), selected (false) - { - if (a == b) -- throw invalid_argument ("Loops not yet supported."); -+ throw std::invalid_argument ("Loops not yet supported."); - } - - Edge::Edge (const Edge &other) : v (other.v), w (other.w), diff --git a/math/graphthing/files/patch-src-factory.cc b/math/graphthing/files/patch-src-factory.cc deleted file mode 100644 index 572b5f270dcb..000000000000 --- a/math/graphthing/files/patch-src-factory.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- src/factory.cc.orig Fri Oct 25 13:49:05 2002 -+++ src/factory.cc Fri Oct 25 13:49:31 2002 -@@ -3,6 +3,7 @@ - */ - - #include <math.h> -+#include <iostream> - #include "edge.h" - #include "factory.h" - #include "graph.h" diff --git a/math/graphthing/files/patch-src-graph.cc b/math/graphthing/files/patch-src-graph.cc index 69640b74d54c..3a9d3b24220b 100644 --- a/math/graphthing/files/patch-src-graph.cc +++ b/math/graphthing/files/patch-src-graph.cc @@ -1,37 +1,11 @@ ---- src/graph.cc.orig Tue Feb 12 05:51:39 2002 -+++ src/graph.cc Fri Oct 25 17:16:21 2002 -@@ -82,8 +82,14 @@ - } - +--- src/graph.cc.orig Sun Mar 23 23:55:29 2003 ++++ src/graph.cc Sun Mar 23 23:58:26 2003 +@@ -96,7 +96,7 @@ /* We don't want anything skipped */ -- fs.setf (0); -- -+#if __FreeBSD__ -+#include <osreldate.h> + #ifdef USING_FREEBSD + #include <osreldate.h> +-#if __FreeBSD_verson >= 500035 +#if __FreeBSD_version >= 500035 -+ fs.setf(std::ios_base::fmtflags(0)); -+#else -+ fs.setf(0); -+#endif -+#endif - new_graph = new Graph (); - yy_gt_fs = &fs; - success = (yy_gt_parse () == 0); -@@ -105,7 +111,7 @@ - fs.open (fname, std::fstream::out); - if (!fs.is_open ()) { - /* std::cerr << "*** Couldn't open \"" << fname << "\"\n"; */ -- throw runtime_error ("Couldn't open file."); -+ throw std::runtime_error ("Couldn't open file."); - } - - fs << *this; -@@ -128,7 +134,7 @@ - fs.open (fname, std::fstream::out); - if (!fs.is_open ()) { - /* std::cerr << "*** Couldn't open \"" << fname << "\"\n"; */ -- throw runtime_error ("Couldn't open file."); -+ throw std::runtime_error ("Couldn't open file."); - } - - minx = miny = 999999; + fs.setf (std::ios_base::fmtflags (0)); + #else + fs.setf (0); diff --git a/math/graphthing/files/patch-src-graph.h b/math/graphthing/files/patch-src-graph.h deleted file mode 100644 index d9d0ebd53a6d..000000000000 --- a/math/graphthing/files/patch-src-graph.h +++ /dev/null @@ -1,25 +0,0 @@ ---- src/graph.h.orig Fri Oct 25 13:50:30 2002 -+++ src/graph.h Fri Oct 25 13:52:29 2002 -@@ -20,16 +20,16 @@ - class Graph - { - private: -- vector<Edge *> E; -- vector<Vertex *> V; -+ std::vector<Edge *> E; -+ std::vector<Vertex *> V; - - - public: - -- typedef vector<Edge *>::iterator e_iterator; -- typedef vector<Vertex *>::iterator v_iterator; -- typedef vector<Edge *>::const_iterator e_const_iterator; -- typedef vector<Vertex *>::const_iterator v_const_iterator; -+ typedef std::vector<Edge *>::iterator e_iterator; -+ typedef std::vector<Vertex *>::iterator v_iterator; -+ typedef std::vector<Edge *>::const_iterator e_const_iterator; -+ typedef std::vector<Vertex *>::const_iterator v_const_iterator; - - - Edge *e_selected_head; diff --git a/math/graphthing/files/patch-src-graph2.cc b/math/graphthing/files/patch-src-graph2.cc deleted file mode 100644 index c2d6f278ce25..000000000000 --- a/math/graphthing/files/patch-src-graph2.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/graph2.cc.orig Fri Oct 25 15:30:29 2002 -+++ src/graph2.cc Fri Oct 25 15:39:39 2002 -@@ -248,7 +248,7 @@ - { - Graph::e_const_iterator eit; - Graph::v_iterator vit; -- queue<Vertex *> vq; -+ std::queue<Vertex *> vq; - int cnt = 1; - - /* Set all marks to 0 */ -@@ -379,7 +379,7 @@ - } - - /* Remove degree 0 vertices */ -- queue<Vertex *> vq; -+ std::queue<Vertex *> vq; - int cnt = 0; - for (vit = v_begin (); vit != v_end (); ++vit) - if ((*vit)->degree () == 0) -@@ -395,7 +395,7 @@ - /* Remove degree 1 vertices */ - int tot = 0; - do { -- queue<Vertex *> vq; -+ std::queue<Vertex *> vq; - cnt = 0; - for (vit = v_begin (); vit != v_end (); ++vit) - if ((*vit)->degree () == 1) diff --git a/math/graphthing/files/patch-src-gui_cb.cc b/math/graphthing/files/patch-src-gui_cb.cc deleted file mode 100644 index 419a35744f26..000000000000 --- a/math/graphthing/files/patch-src-gui_cb.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- src/gui_cb.cc.orig Fri Oct 25 15:50:57 2002 -+++ src/gui_cb.cc Fri Oct 25 15:52:46 2002 -@@ -253,8 +253,8 @@ - - void GUI::cb_Graph_Statistics_DegreeSequence () - { -- vector<int> seq; -- vector<int>::iterator it1, it2; -+ std::vector<int> seq; -+ std::vector<int>::iterator it1, it2; - Graph::v_const_iterator vit; - - if (graph->order () < 1) { diff --git a/math/graphthing/files/patch-src-matrix.cc b/math/graphthing/files/patch-src-matrix.cc deleted file mode 100644 index 09aa7e748f47..000000000000 --- a/math/graphthing/files/patch-src-matrix.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- src/matrix.cc.orig Fri Oct 25 16:02:15 2002 -+++ src/matrix.cc Fri Oct 25 15:58:21 2002 -@@ -166,14 +166,14 @@ - { - unsigned int i, j; - -- o << '/' << string (mat.rep->columns * 2, '-') << "-\\\n"; -+ o << '/' << std::string (mat.rep->columns * 2, '-') << "-\\\n"; - for (j = 0; j < mat.rep->rows; ++j) { - o << "| "; - for (i = 0; i < mat.rep->columns; ++i) - o << mat (i, j) << ' '; - o << "|\n"; - } -- o << '\\' << string (mat.rep->columns * 2, '-') << "-/\n"; -+ o << '\\' << std::string (mat.rep->columns * 2, '-') << "-/\n"; - - return o; - } diff --git a/math/graphthing/files/patch-src-polynomial.cc b/math/graphthing/files/patch-src-polynomial.cc deleted file mode 100644 index 97c4579c55b6..000000000000 --- a/math/graphthing/files/patch-src-polynomial.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/polynomial.cc.orig Fri Oct 25 16:00:00 2002 -+++ src/polynomial.cc Fri Oct 25 16:01:50 2002 -@@ -23,7 +23,7 @@ - - void Polynomial::minimise () - { -- vector<int>::iterator it; -+ std::vector<int>::iterator it; - - for (it = rep->data.end () - 1; it != rep->data.begin (); --it) - if (*it) -@@ -142,7 +142,7 @@ - - int Polynomial::eval (int x) const - { -- vector<int>::reverse_iterator it; -+ std::vector<int>::reverse_iterator it; - int val; - - val = 0; -@@ -200,7 +200,7 @@ - - std::ostream &operator<< (std::ostream &o, const Polynomial &p) - { -- vector<int>::reverse_iterator it; -+ std::vector<int>::reverse_iterator it; - int pow, val; - bool sp; - diff --git a/math/graphthing/files/patch-src-polynomial.h b/math/graphthing/files/patch-src-polynomial.h deleted file mode 100644 index 2f36f68b6cec..000000000000 --- a/math/graphthing/files/patch-src-polynomial.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/polynomial.h.orig Tue Feb 12 05:56:44 2002 -+++ src/polynomial.h Fri Oct 25 15:56:13 2002 -@@ -16,7 +16,7 @@ - class PolynomialRep - { - public: -- vector<int> data; -+ std::vector<int> data; - unsigned int ref; - - PolynomialRep (); -@@ -52,7 +52,7 @@ - int operator() (int x) const; - Polynomial &operator= (const Polynomial &other); - -- friend ostream &operator<< (ostream &o, const Polynomial &p); -+ friend std::ostream &operator<< (std::ostream &o, const Polynomial &p); - friend bool operator== (const Polynomial &p1, - const Polynomial &p2); - void operator+= (const Polynomial &other); diff --git a/math/graphthing/files/patch-src-string.cc b/math/graphthing/files/patch-src-string.cc deleted file mode 100644 index d15107e8754a..000000000000 --- a/math/graphthing/files/patch-src-string.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- src/string.cc.orig Fri Oct 25 16:04:09 2002 -+++ src/string.cc Fri Oct 25 16:09:45 2002 -@@ -38,7 +38,7 @@ - strcpy (data, s); - } - --String::StringRep::StringRep (const string &s) -+String::StringRep::StringRep (const std::string &s) - { - len = s.size (); - size = (len + 8) & ~7; -@@ -71,7 +71,7 @@ - ++rep->ref; - } - --String::String (const string &s) -+String::String (const std::string &s) - { - rep = new StringRep (s); - ++rep->ref; -@@ -156,9 +156,9 @@ - return rep->data; - } - --string String::std_str () const -+std::string String::std_str () const - { -- return string (rep->data); -+ return std::string (rep->data); - } - - bool String::empty () const diff --git a/math/graphthing/files/patch-src-string.h b/math/graphthing/files/patch-src-string.h deleted file mode 100644 index 7f1d6385a623..000000000000 --- a/math/graphthing/files/patch-src-string.h +++ /dev/null @@ -1,38 +0,0 @@ ---- src/string.h.orig Tue Feb 12 05:28:42 2002 -+++ src/string.h Fri Oct 25 13:44:29 2002 -@@ -23,7 +23,7 @@ - StringRep (); - StringRep (unsigned int n); - StringRep (const char *s); -- StringRep (const string &s); -+ StringRep (const std::string &s); - ~StringRep (); - }; - -@@ -34,7 +34,7 @@ - public: - String (); - String (const char *s); -- String (const string &s); -+ String (const std::string &s); - String (const String &s); - ~String (); - -@@ -43,7 +43,7 @@ - int compare (const char *s) const; - int compare (const String &s) const; - const char *c_str () const; -- string std_str () const; -+ std::string std_str () const; - bool empty () const; - - String &operator= (const String &other); -@@ -57,7 +57,7 @@ - char &operator[] (unsigned int i); - const char &operator[] (unsigned int i) const; - -- friend ostream &operator<< (ostream &o, const String &s); -+ friend std::ostream &operator<< (std::ostream &o, const String &s); - }; - - diff --git a/math/graphthing/files/patch-src-unit_test.cc b/math/graphthing/files/patch-src-unit_test.cc deleted file mode 100644 index 3b7067149e14..000000000000 --- a/math/graphthing/files/patch-src-unit_test.cc +++ /dev/null @@ -1,53 +0,0 @@ ---- src/unit_test.cc.orig Fri Oct 25 16:15:51 2002 -+++ src/unit_test.cc Fri Oct 25 16:21:23 2002 -@@ -19,14 +19,14 @@ - - - #define TEST_FAIL \ -- cout << "\t* Failure at line " << __LINE__ << '\n' -+ std::cout << "\t* Failure at line " << __LINE__ << '\n' - #define TEST(test) \ - ++subtests; \ - if (!(test)) { ++errors; TEST_FAIL; } - #define START_TEST(name) \ - ++tests; \ - test_name = (name); \ -- cout << "Running test " << tests << ": '" << test_name \ -+ std::cout << "Running test " << tests << ": '" << test_name \ - << "'\n" - - -@@ -37,9 +37,9 @@ - char *test_name; - - -- cout << "-----------------------------\n"; -- cout << " GraphThing unit testing\n"; -- cout << "-----------------------------\n"; -+ std::cout << "-----------------------------\n"; -+ std::cout << " GraphThing unit testing\n"; -+ std::cout << "-----------------------------\n"; - - - /**************** START OF TESTS ****************/ -@@ -107,13 +107,13 @@ - - /**************** END OF TESTS ****************/ - -- cout << "\n"; -- cout << "-----------------------------\n"; -- cout << "Total tests: " << tests << '\n'; -- cout << " Errors: " << errors << '\n'; -- cout << '\n'; -- cout << " (Subtests: " << subtests << ")\n"; -- cout << "-----------------------------\n"; -+ std::cout << "\n"; -+ std::cout << "-----------------------------\n"; -+ std::cout << "Total tests: " << tests << '\n'; -+ std::cout << " Errors: " << errors << '\n'; -+ std::cout << '\n'; -+ std::cout << " (Subtests: " << subtests << ")\n"; -+ std::cout << "-----------------------------\n"; - - return 0; - } diff --git a/math/graphthing/files/patch-src-vertex.h b/math/graphthing/files/patch-src-vertex.h deleted file mode 100644 index eeb61900221b..000000000000 --- a/math/graphthing/files/patch-src-vertex.h +++ /dev/null @@ -1,27 +0,0 @@ ---- src/vertex.h.orig Tue Feb 12 05:47:23 2002 -+++ src/vertex.h Fri Oct 25 16:13:18 2002 -@@ -15,12 +15,12 @@ - class Vertex - { - private: -- vector<Edge *> edges; /* Edges adjacent to this vertex */ -+ std::vector<Edge *> edges; /* Edges adjacent to this vertex */ - - public: - -- typedef vector<Edge *>::iterator e_iterator; -- typedef vector<Edge *>::const_iterator e_const_iterator; -+ typedef std::vector<Edge *>::iterator e_iterator; -+ typedef std::vector<Edge *>::const_iterator e_const_iterator; - - String label; - int x; -@@ -45,7 +45,7 @@ - void unhook (Edge *e); - - Vertex &operator= (const Vertex &other); -- friend ostream &operator<< (ostream &o, const Vertex &v); -+ friend std::ostream &operator<< (std::ostream &o, const Vertex &v); - }; - - #endif /* __VERTEX_H__ */ |