From 25140202fc745688c636a0eab6dffbaa9675daff Mon Sep 17 00:00:00 2001 From: miwi Date: Mon, 5 Nov 2007 10:04:20 +0000 Subject: - Fix build with gcc 4.2 PR: 117789 Submitted by: Pietro Cerutti Approved by: portmgr (pav) --- devel/clint/Makefile | 11 +- devel/clint/files/patch-doc-clint.texinfo | 21 +++ devel/clint/files/patch-doc::clint.texi | 21 --- devel/clint/files/patch-input.cc | 33 ----- devel/clint/files/patch-lib-python-mapbase.cc | 160 +++++++++++++++++++++ devel/clint/files/patch-lib-python-mapref.cc | 20 +++ devel/clint/files/patch-lib-python-python.cc | 11 ++ devel/clint/files/patch-lib-python-python.h | 50 +++++++ .../files/patch-lib-python-seqbase_const_iter.cc | 60 ++++++++ devel/clint/files/patch-lib-python-seqbase_iter.cc | 67 +++++++++ .../files/patch-plugins-python-python_plugin.cc | 15 ++ devel/clint/files/patch-python.h | 47 ------ devel/clint/files/patch-python_plugin.cc | 15 -- devel/clint/files/patch-seqbase_const_iter.cc | 60 -------- devel/clint/files/patch-seqbase_iter.cc | 60 -------- devel/clint/files/patch-src-clint.cc | 11 ++ devel/clint/files/patch-src-input.cc | 33 +++++ devel/clint/files/patch-src-utility.cc | 18 +++ devel/clint/files/patch-utility.cc | 18 --- 19 files changed, 468 insertions(+), 263 deletions(-) create mode 100644 devel/clint/files/patch-doc-clint.texinfo delete mode 100644 devel/clint/files/patch-doc::clint.texi delete mode 100644 devel/clint/files/patch-input.cc create mode 100644 devel/clint/files/patch-lib-python-mapbase.cc create mode 100644 devel/clint/files/patch-lib-python-mapref.cc create mode 100644 devel/clint/files/patch-lib-python-python.cc create mode 100644 devel/clint/files/patch-lib-python-python.h create mode 100644 devel/clint/files/patch-lib-python-seqbase_const_iter.cc create mode 100644 devel/clint/files/patch-lib-python-seqbase_iter.cc create mode 100644 devel/clint/files/patch-plugins-python-python_plugin.cc delete mode 100644 devel/clint/files/patch-python.h delete mode 100644 devel/clint/files/patch-python_plugin.cc delete mode 100644 devel/clint/files/patch-seqbase_const_iter.cc delete mode 100644 devel/clint/files/patch-seqbase_iter.cc create mode 100644 devel/clint/files/patch-src-clint.cc create mode 100644 devel/clint/files/patch-src-input.cc create mode 100644 devel/clint/files/patch-src-utility.cc delete mode 100644 devel/clint/files/patch-utility.cc diff --git a/devel/clint/Makefile b/devel/clint/Makefile index 8268734c790b..e23d3a8a49d8 100644 --- a/devel/clint/Makefile +++ b/devel/clint/Makefile @@ -10,8 +10,7 @@ PORTNAME= clint PORTVERSION= 0.1.2 PORTREVISION= 4 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A static source code checker for C++ @@ -25,16 +24,10 @@ USE_LDCONFIG= yes INFO= clint -.include - -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-pedantic||g ; \ s|-ldl||g' -.include +.include diff --git a/devel/clint/files/patch-doc-clint.texinfo b/devel/clint/files/patch-doc-clint.texinfo new file mode 100644 index 000000000000..b9518187f08e --- /dev/null +++ b/devel/clint/files/patch-doc-clint.texinfo @@ -0,0 +1,21 @@ +--- doc/clint.texinfo.orig Tue Apr 17 04:52:44 2001 ++++ doc/clint.texinfo Sat Oct 18 21:02:43 2003 +@@ -2,6 +2,10 @@ + @c %**start of header + @setfilename clint.info + @settitle Clint is a static source code checker for C++ ++@dircategory Programming & development tools ++@direntry ++* Clint: (clint). A static source code checker for C++ ++@end direntry + @finalout + @setchapternewpage odd + @c %**end of header +@@ -94,7 +98,6 @@ + professional experience.) + + @node Copying, Overview, Instructions, Top +-@include gpl.texinfo + + @node Overview, Sample, Copying, Top + @chapter Overview diff --git a/devel/clint/files/patch-doc::clint.texi b/devel/clint/files/patch-doc::clint.texi deleted file mode 100644 index b9518187f08e..000000000000 --- a/devel/clint/files/patch-doc::clint.texi +++ /dev/null @@ -1,21 +0,0 @@ ---- doc/clint.texinfo.orig Tue Apr 17 04:52:44 2001 -+++ doc/clint.texinfo Sat Oct 18 21:02:43 2003 -@@ -2,6 +2,10 @@ - @c %**start of header - @setfilename clint.info - @settitle Clint is a static source code checker for C++ -+@dircategory Programming & development tools -+@direntry -+* Clint: (clint). A static source code checker for C++ -+@end direntry - @finalout - @setchapternewpage odd - @c %**end of header -@@ -94,7 +98,6 @@ - professional experience.) - - @node Copying, Overview, Instructions, Top --@include gpl.texinfo - - @node Overview, Sample, Copying, Top - @chapter Overview diff --git a/devel/clint/files/patch-input.cc b/devel/clint/files/patch-input.cc deleted file mode 100644 index 948a7e563837..000000000000 --- a/devel/clint/files/patch-input.cc +++ /dev/null @@ -1,33 +0,0 @@ ---- src/input.cc.orig Fri Sep 6 22:17:58 2002 -+++ src/input.cc Fri Sep 6 22:21:11 2002 -@@ -70,17 +70,17 @@ - std::string Input::parse_cpp(std::string line) { - if (line[0] == '#') { - #ifdef HAVE_SSTREAM -- istringstream in(line); -+ std::istringstream in(line); - #else - istrstream in(line.c_str()); - #endif // HAVE_SSTREAM - in.get(); // remove '#' -- string command; -+ std::string command; - while (isalnum(in.peek()) && not in.eof()){ - command+=in.get(); - } -- cerr << "line = \"" << line << "\" command = \"" << command << "\" "; -- if (command == string("include") ) { -+ std::cerr << "line = \"" << line << "\" command = \"" << command << "\" "; -+ if (command == std::string("include") ) { - } else if ( command == "define" ) { - } else if ( command == "undef" ) { - } else if ( command == "if" ) { -@@ -101,7 +101,7 @@ - // Apparently this is valid - // Ignore this - } else { -- cerr << "Unknown preprocessor macro" << endl; -+ std::cerr << "Unknown preprocessor macro" << std::endl; - } - } - return line; diff --git a/devel/clint/files/patch-lib-python-mapbase.cc b/devel/clint/files/patch-lib-python-mapbase.cc new file mode 100644 index 000000000000..bc70fe618145 --- /dev/null +++ b/devel/clint/files/patch-lib-python-mapbase.cc @@ -0,0 +1,160 @@ +--- lib/python/mapbase.cc.orig 2007-11-03 16:17:47.000000000 +0100 ++++ lib/python/mapbase.cc 2007-11-03 16:18:22.000000000 +0100 +@@ -2,30 +2,30 @@ + #include "python.h" + + namespace python { +-export template +- MapBase::MapBase (PyObject *pyob, bool owned): Object(pyob, owned) { ++ template ++ MapBase::MapBase (PyObject *pyob, bool owned): Object(pyob, owned) { + validate(); + } + +- export template +- MapBase::MapBase (const MapBase& ob): Object(ob) { ++ template ++ MapBase::MapBase (const MapBase& ob): Object(ob) { + validate(); + } + // Assignment acquires new ownership of pointer + +- export template ++ template + MapBase& MapBase::operator= (const Object& rhs) { + return (*this = *rhs); + } + +- export template ++ template + MapBase& MapBase::operator= (PyObject* rhsp) { + if(ptr() == rhsp) return *this; + set (rhsp); + return *this; + } + // Membership +- export template ++ template + bool MapBase::accepts (PyObject *pyob) const { + return pyob && PyMapping_Check(pyob); + } +@@ -33,7 +33,7 @@ + // Clear -- PyMapping Clear is missing + // + +- export template ++ template + void MapBase::clear () { + List k = keys(); + for(List::iterator i = k.begin(); i != k.end(); i++) { +@@ -42,54 +42,54 @@ + } + + // Element Access +- export template ++ template + T MapBase::operator[](const std::string& key) const { + return get_item(key); + } + +- export template ++ template + T MapBase::operator[](const Object& key) const { + return get_item(key); + } + +- export template ++ template + mapref MapBase::operator[](const std::string& key) { + return mapref(*this, key); + } + +- export template ++ template + mapref MapBase::operator[](const Object& key) { + return mapref(*this, key); + } + +- export template ++ template + int MapBase::length () const { + return PyMapping_Length (ptr()); + } + +- export template ++ template + int MapBase::has_key (const std::string& s) const { + return PyMapping_HasKeyString (ptr(),const_cast(s.c_str())); + } + +- export template ++ template + int MapBase::has_key (const Object& s) const { + return PyMapping_HasKey (ptr(), s.ptr()); + } + +- export template ++ template + T MapBase::get_item (const std::string& s) const { + PyObject * tmp = (PyMapping_GetItemString (ptr(),const_cast(s.c_str()))); + if ( tmp == NULL ) { throw KeyError(s + " does not exist in " + this->as_string()); } + return T( asObject(tmp)); + } + +- export template ++ template + T MapBase::get_item (const Object& s) const { + return T( asObject(PyObject_GetItem (ptr(), s.ptr()))); + } + +- export template ++ template + void MapBase::set_item (const std::string& s, const Object& ob) { + if (PyMapping_SetItemString (ptr(), const_cast(s.c_str()), *ob) + == -1) +@@ -98,7 +98,7 @@ + } + } + +- export template ++ template + void MapBase::set_item (const Object& s, const Object& ob) { + if (PyObject_SetItem (ptr(), s.ptr(), ob.ptr()) + == -1) +@@ -107,31 +107,31 @@ + } + } + +- export template ++ template + void MapBase::del_item (const std::string& s) { + if (PyMapping_DelItemString (ptr(), const_cast(s.c_str())) == -1){ + throw Exception(); + } + } + +- export template ++ template + void MapBase::del_item (const Object& s) { + if (PyMapping_DelItem (ptr(), *s) == -1){ + throw Exception(); + } + } + // Queries +- export template ++ template + List MapBase::keys () const { + return List(PyMapping_Keys(ptr()), true); + } + +- export template ++ template + List MapBase::values () const { // each returned item is a (key, value) pair + return List(PyMapping_Values(ptr()), true); + } + +- export template ++ template + List MapBase::items () const { + return List(PyMapping_Items(ptr()), true); + } diff --git a/devel/clint/files/patch-lib-python-mapref.cc b/devel/clint/files/patch-lib-python-mapref.cc new file mode 100644 index 000000000000..c79b07df9bf9 --- /dev/null +++ b/devel/clint/files/patch-lib-python-mapref.cc @@ -0,0 +1,20 @@ +--- lib/python/mapref.cc.orig 2007-11-03 16:16:58.000000000 +0100 ++++ lib/python/mapref.cc 2007-11-03 16:17:25.000000000 +0100 +@@ -2,7 +2,7 @@ + + namespace python { + template +- mapref::mapref (MapBase& map, const std::string& k) ++ mapref::mapref (MapBase& map, const std::string& k) + : s(map), the_item() + { + key = String(k); +@@ -10,7 +10,7 @@ + }; + + template +- mapref::mapref (MapBase& map, const Object& k) ++ mapref::mapref (MapBase& map, const Object& k) + : s(map), key(k), the_item() + { + if(map.hasKey(key)) the_item = map.getItem(key); diff --git a/devel/clint/files/patch-lib-python-python.cc b/devel/clint/files/patch-lib-python-python.cc new file mode 100644 index 000000000000..3847bb6fb4ea --- /dev/null +++ b/devel/clint/files/patch-lib-python-python.cc @@ -0,0 +1,11 @@ +--- lib/python/python.cc.orig 2007-11-03 16:32:34.000000000 +0100 ++++ lib/python/python.cc 2007-11-03 16:33:48.000000000 +0100 +@@ -115,6 +115,8 @@ + } else { + return import_module(modname); + } ++ ++ return (NULL); + } + + // }}} diff --git a/devel/clint/files/patch-lib-python-python.h b/devel/clint/files/patch-lib-python-python.h new file mode 100644 index 000000000000..e4be9dff23fc --- /dev/null +++ b/devel/clint/files/patch-lib-python-python.h @@ -0,0 +1,50 @@ +--- lib/python/python.h.orig 2001-04-16 21:53:21.000000000 +0200 ++++ lib/python/python.h 2007-11-03 16:31:32.000000000 +0100 +@@ -3,22 +3,42 @@ + + #pragma interface + ++#include ++#undef isalnum ++#undef isalpha ++#undef iscntrl ++#undef isdigit ++#undef isgraph ++#undef islower ++#undef isprint ++#undef ispunct ++#undef isspace ++#undef isupper ++#undef isxdigit ++#undef tolower ++#undef toupper ++#include ++ + #include + #include + #include + #include +-#include ++#include + #include "exceptions.h" + #include "debug.h" + + // I hate #define macros, seee if I can remove this +-#define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1 ++#define STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR 1 + #ifdef MS_WIN32 +-# undef STANDARD_LIBRARY_HAS_ITERATOR_TRAITS +-# define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0 ++# undef STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR ++# define STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR 0 ++#endif ++ ++#if defined (__GNUG__) && (__GNUG__ >= 3) ++# undef STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR + #endif + +-#if STANDARD_LIBRARY_HAS_ITERATOR_TRAITS ++#if STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR + # define random_access_iterator_parent(itemtype) std::random_access_iterator + #else + # define random_access_iterator_parent(itemtype) std::iterator diff --git a/devel/clint/files/patch-lib-python-seqbase_const_iter.cc b/devel/clint/files/patch-lib-python-seqbase_const_iter.cc new file mode 100644 index 000000000000..fde1b44e84e1 --- /dev/null +++ b/devel/clint/files/patch-lib-python-seqbase_const_iter.cc @@ -0,0 +1,60 @@ +--- lib/python/seqbase_const_iter.cc.orig Mon Apr 16 12:53:23 2001 ++++ lib/python/seqbase_const_iter.cc Thu Nov 30 22:11:19 2006 +@@ -61,7 +61,7 @@ + return seq->getItem(count + i); + } + +- template ++ template typename + SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator=(const const_iterator& other) { + if (this == &other) return *this; + seq = other.seq; +@@ -69,23 +69,23 @@ + return *this; + } + +- template ++ template typename + SeqBase::const_iterator::const_iterator SeqBase::const_iterator::operator+(int n) const { + return const_iterator(seq, count + n); + } + +- template ++ template typename + SeqBase::const_iterator::const_iterator SeqBase::const_iterator::operator-(int n) const { + return const_iterator(seq, count - n); + } + +- template ++ template typename + SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator+=(int n) { + count = count + n; + return *this; + } + +- template ++ template typename + SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator-=(int n) { + count = count - n; + return *this; +@@ -98,16 +98,16 @@ + return count - other.count; + } + // prefix ++ +- template ++ template typename + SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator++ () { count++; return *this;} + // postfix ++ +- template ++ template typename + SeqBase::const_iterator::const_iterator SeqBase::const_iterator::operator++ (int) { return const_iterator(seq, count++);} + // prefix -- +- template ++ template typename + SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator-- () { count--; return *this;} + // postfix -- +- template ++ template typename + SeqBase::const_iterator::const_iterator SeqBase::const_iterator::operator-- (int) { return const_iterator(seq, count--);} + + } diff --git a/devel/clint/files/patch-lib-python-seqbase_iter.cc b/devel/clint/files/patch-lib-python-seqbase_iter.cc new file mode 100644 index 000000000000..e34b41f0b894 --- /dev/null +++ b/devel/clint/files/patch-lib-python-seqbase_iter.cc @@ -0,0 +1,67 @@ +--- lib/python/seqbase_iter.cc.orig 2001-04-16 21:53:23.000000000 +0200 ++++ lib/python/seqbase_iter.cc 2007-11-03 16:39:31.000000000 +0100 +@@ -61,7 +61,7 @@ + return seqref(*seq, count + i); + } + +- template ++ template typename + SeqBase::iterator& SeqBase::iterator::operator=(const iterator& other) { + if (this == &other) return *this; + seq = other.seq; +@@ -69,23 +69,23 @@ + return *this; + } + +- template ++ template typename + SeqBase::iterator SeqBase::iterator::operator+(int n) const { + return iterator(seq, count + n); + } + +- template ++ template typename + SeqBase::iterator SeqBase::iterator::operator-(int n) const { + return iterator(seq, count - n); + } + +- template ++ template typename + SeqBase::iterator& SeqBase::iterator::operator+=(int n) { + count = count + n; + return *this; + } + +- template ++ template typename + SeqBase::iterator& SeqBase::iterator::operator-=(int n) { + count = count - n; + return *this; +@@ -99,21 +99,22 @@ + } + + // prefix ++ +- template ++ template typename + SeqBase::iterator& SeqBase::iterator::operator++ () { count++; return *this;} + // postfix ++ +- template ++ template typename + SeqBase::iterator SeqBase::iterator::operator++ (int) { return iterator(seq, count++);} + // prefix -- +- template ++ template typename + SeqBase::iterator& SeqBase::iterator::operator-- () { count--; return *this;} + // postfix -- +- template ++ template typename + SeqBase::iterator SeqBase::iterator::operator-- (int) { return iterator(seq, count--);} + + template + std::string SeqBase::iterator::diagnose() const { +- std::ostrstream oss; ++ std::ostringstream oss; ++ //std::ostrstream oss; + oss << "iterator diagnosis " << seq << ", " << count << std::ends; + return std::string(oss.str()); + } diff --git a/devel/clint/files/patch-plugins-python-python_plugin.cc b/devel/clint/files/patch-plugins-python-python_plugin.cc new file mode 100644 index 000000000000..15f50a49b9b5 --- /dev/null +++ b/devel/clint/files/patch-plugins-python-python_plugin.cc @@ -0,0 +1,15 @@ +--- plugins/python/python_plugin.cc.orig Mon Apr 16 13:23:28 2001 ++++ plugins/python/python_plugin.cc Thu Nov 30 22:35:49 2006 +@@ -51,11 +51,11 @@ + rules.push_back( rule ); + } + } ++ closedir(curdir); + } else { + // There is something wrong with the directory. Probably doesn't + // exist + } +- closedir(curdir); + return; + } + diff --git a/devel/clint/files/patch-python.h b/devel/clint/files/patch-python.h deleted file mode 100644 index 88e8ee15e347..000000000000 --- a/devel/clint/files/patch-python.h +++ /dev/null @@ -1,47 +0,0 @@ ---- lib/python/python.h.orig Mon Apr 16 12:53:21 2001 -+++ lib/python/python.h Thu Nov 30 22:25:14 2006 -@@ -3,6 +3,22 @@ - - #pragma interface - -+#include -+#undef isalnum -+#undef isalpha -+#undef iscntrl -+#undef isdigit -+#undef isgraph -+#undef islower -+#undef isprint -+#undef ispunct -+#undef isspace -+#undef isupper -+#undef isxdigit -+#undef tolower -+#undef toupper -+#include -+ - #include - #include - #include -@@ -12,13 +28,17 @@ - #include "debug.h" - - // I hate #define macros, seee if I can remove this --#define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1 -+#define STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR 1 - #ifdef MS_WIN32 --# undef STANDARD_LIBRARY_HAS_ITERATOR_TRAITS --# define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0 -+# undef STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR -+# define STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR 0 -+#endif -+ -+#if defined (__GNUG__) && (__GNUG__ >= 3) -+# undef STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR - #endif - --#if STANDARD_LIBRARY_HAS_ITERATOR_TRAITS -+#if STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR - # define random_access_iterator_parent(itemtype) std::random_access_iterator - #else - # define random_access_iterator_parent(itemtype) std::iterator diff --git a/devel/clint/files/patch-python_plugin.cc b/devel/clint/files/patch-python_plugin.cc deleted file mode 100644 index 15f50a49b9b5..000000000000 --- a/devel/clint/files/patch-python_plugin.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/python/python_plugin.cc.orig Mon Apr 16 13:23:28 2001 -+++ plugins/python/python_plugin.cc Thu Nov 30 22:35:49 2006 -@@ -51,11 +51,11 @@ - rules.push_back( rule ); - } - } -+ closedir(curdir); - } else { - // There is something wrong with the directory. Probably doesn't - // exist - } -- closedir(curdir); - return; - } - diff --git a/devel/clint/files/patch-seqbase_const_iter.cc b/devel/clint/files/patch-seqbase_const_iter.cc deleted file mode 100644 index fde1b44e84e1..000000000000 --- a/devel/clint/files/patch-seqbase_const_iter.cc +++ /dev/null @@ -1,60 +0,0 @@ ---- lib/python/seqbase_const_iter.cc.orig Mon Apr 16 12:53:23 2001 -+++ lib/python/seqbase_const_iter.cc Thu Nov 30 22:11:19 2006 -@@ -61,7 +61,7 @@ - return seq->getItem(count + i); - } - -- template -+ template typename - SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator=(const const_iterator& other) { - if (this == &other) return *this; - seq = other.seq; -@@ -69,23 +69,23 @@ - return *this; - } - -- template -+ template typename - SeqBase::const_iterator::const_iterator SeqBase::const_iterator::operator+(int n) const { - return const_iterator(seq, count + n); - } - -- template -+ template typename - SeqBase::const_iterator::const_iterator SeqBase::const_iterator::operator-(int n) const { - return const_iterator(seq, count - n); - } - -- template -+ template typename - SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator+=(int n) { - count = count + n; - return *this; - } - -- template -+ template typename - SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator-=(int n) { - count = count - n; - return *this; -@@ -98,16 +98,16 @@ - return count - other.count; - } - // prefix ++ -- template -+ template typename - SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator++ () { count++; return *this;} - // postfix ++ -- template -+ template typename - SeqBase::const_iterator::const_iterator SeqBase::const_iterator::operator++ (int) { return const_iterator(seq, count++);} - // prefix -- -- template -+ template typename - SeqBase::const_iterator::const_iterator& SeqBase::const_iterator::operator-- () { count--; return *this;} - // postfix -- -- template -+ template typename - SeqBase::const_iterator::const_iterator SeqBase::const_iterator::operator-- (int) { return const_iterator(seq, count--);} - - } diff --git a/devel/clint/files/patch-seqbase_iter.cc b/devel/clint/files/patch-seqbase_iter.cc deleted file mode 100644 index 04de79ed65a0..000000000000 --- a/devel/clint/files/patch-seqbase_iter.cc +++ /dev/null @@ -1,60 +0,0 @@ ---- lib/python/seqbase_iter.cc.orig Mon Apr 16 12:53:23 2001 -+++ lib/python/seqbase_iter.cc Thu Nov 30 22:09:39 2006 -@@ -61,7 +61,7 @@ - return seqref(*seq, count + i); - } - -- template -+ template typename - SeqBase::iterator& SeqBase::iterator::operator=(const iterator& other) { - if (this == &other) return *this; - seq = other.seq; -@@ -69,23 +69,23 @@ - return *this; - } - -- template -+ template typename - SeqBase::iterator SeqBase::iterator::operator+(int n) const { - return iterator(seq, count + n); - } - -- template -+ template typename - SeqBase::iterator SeqBase::iterator::operator-(int n) const { - return iterator(seq, count - n); - } - -- template -+ template typename - SeqBase::iterator& SeqBase::iterator::operator+=(int n) { - count = count + n; - return *this; - } - -- template -+ template typename - SeqBase::iterator& SeqBase::iterator::operator-=(int n) { - count = count - n; - return *this; -@@ -99,16 +99,16 @@ - } - - // prefix ++ -- template -+ template typename - SeqBase::iterator& SeqBase::iterator::operator++ () { count++; return *this;} - // postfix ++ -- template -+ template typename - SeqBase::iterator SeqBase::iterator::operator++ (int) { return iterator(seq, count++);} - // prefix -- -- template -+ template typename - SeqBase::iterator& SeqBase::iterator::operator-- () { count--; return *this;} - // postfix -- -- template -+ template typename - SeqBase::iterator SeqBase::iterator::operator-- (int) { return iterator(seq, count--);} - - template diff --git a/devel/clint/files/patch-src-clint.cc b/devel/clint/files/patch-src-clint.cc new file mode 100644 index 000000000000..94b34d1d0a18 --- /dev/null +++ b/devel/clint/files/patch-src-clint.cc @@ -0,0 +1,11 @@ +--- src/clint.cc.orig 2007-11-03 16:42:29.000000000 +0100 ++++ src/clint.cc 2007-11-03 16:42:48.000000000 +0100 +@@ -25,7 +25,7 @@ + #include "plugin.h" + #include + #include "rule.h" +-#include ++#include + #include + #include "utility.h" + #include diff --git a/devel/clint/files/patch-src-input.cc b/devel/clint/files/patch-src-input.cc new file mode 100644 index 000000000000..948a7e563837 --- /dev/null +++ b/devel/clint/files/patch-src-input.cc @@ -0,0 +1,33 @@ +--- src/input.cc.orig Fri Sep 6 22:17:58 2002 ++++ src/input.cc Fri Sep 6 22:21:11 2002 +@@ -70,17 +70,17 @@ + std::string Input::parse_cpp(std::string line) { + if (line[0] == '#') { + #ifdef HAVE_SSTREAM +- istringstream in(line); ++ std::istringstream in(line); + #else + istrstream in(line.c_str()); + #endif // HAVE_SSTREAM + in.get(); // remove '#' +- string command; ++ std::string command; + while (isalnum(in.peek()) && not in.eof()){ + command+=in.get(); + } +- cerr << "line = \"" << line << "\" command = \"" << command << "\" "; +- if (command == string("include") ) { ++ std::cerr << "line = \"" << line << "\" command = \"" << command << "\" "; ++ if (command == std::string("include") ) { + } else if ( command == "define" ) { + } else if ( command == "undef" ) { + } else if ( command == "if" ) { +@@ -101,7 +101,7 @@ + // Apparently this is valid + // Ignore this + } else { +- cerr << "Unknown preprocessor macro" << endl; ++ std::cerr << "Unknown preprocessor macro" << std::endl; + } + } + return line; diff --git a/devel/clint/files/patch-src-utility.cc b/devel/clint/files/patch-src-utility.cc new file mode 100644 index 000000000000..8e511b506d8e --- /dev/null +++ b/devel/clint/files/patch-src-utility.cc @@ -0,0 +1,18 @@ +--- src/utility.cc.orig Mon Apr 16 13:19:36 2001 ++++ src/utility.cc Thu Nov 30 22:31:32 2006 +@@ -40,6 +40,7 @@ + filelist.push_back(filename); + } + } ++ closedir(curdir); + } else { + // There is something wrong with the directory. Probably + // doesn't exist +@@ -47,7 +48,6 @@ + // directory + // throw std::invalid_argument("get_plugin_list: something is wrong with the directory " + directory); + } +- closedir(curdir); + return; + } + diff --git a/devel/clint/files/patch-utility.cc b/devel/clint/files/patch-utility.cc deleted file mode 100644 index 8e511b506d8e..000000000000 --- a/devel/clint/files/patch-utility.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- src/utility.cc.orig Mon Apr 16 13:19:36 2001 -+++ src/utility.cc Thu Nov 30 22:31:32 2006 -@@ -40,6 +40,7 @@ - filelist.push_back(filename); - } - } -+ closedir(curdir); - } else { - // There is something wrong with the directory. Probably - // doesn't exist -@@ -47,7 +48,6 @@ - // directory - // throw std::invalid_argument("get_plugin_list: something is wrong with the directory " + directory); - } -- closedir(curdir); - return; - } - -- cgit