diff -u htmlinc/bytevector.cc htmlinc-1/bytevector.cc --- htmlinc/bytevector.cc 2000-08-07 10:56:23.000000000 +0200 +++ htmlinc-1/bytevector.cc 2002-09-11 13:55:25.000000000 +0200 @@ -119,7 +119,7 @@ } bool Bytevector::freadln(int file,char seperator){ - vector v; + std::vector v; Bytevector *b; int index=0; int status; @@ -152,7 +152,7 @@ void Bytevector::freadeof(int file){ - vector v; + std::vector v; Bytevector *b; int index=0; int status; diff -u htmlinc/bytevector.h htmlinc-1/bytevector.h --- htmlinc/bytevector.h 2000-08-07 10:56:23.000000000 +0200 +++ htmlinc-1/bytevector.h 2002-09-11 13:54:50.000000000 +0200 @@ -54,7 +54,7 @@ -class VectorIndexList : public vector { +class VectorIndexList : public std::vector { }; diff -u htmlinc/stringlist.cc htmlinc-1/stringlist.cc --- htmlinc/stringlist.cc 2000-08-07 10:56:23.000000000 +0200 +++ htmlinc-1/stringlist.cc 2002-09-11 13:57:47.000000000 +0200 @@ -283,7 +283,7 @@ for (Stringlist::iterator i=begin(); i!=end(); i++){ delete *i; } - vector::clear(); + std::vector::clear(); } @@ -373,7 +373,7 @@ void Stringlist::insert(Bytevector *b, int pos){ iterator i=begin()+pos; - vector::insert(i,b); + std::vector::insert(i,b); } void Stringlist::insert(Bytevector &b, int pos){ @@ -417,7 +417,7 @@ Bytevector& Stringlist::operator[](int i){ - return *(vector::operator[](i)); + return *(std::vector::operator[](i)); } diff -u htmlinc/stringlist.h htmlinc-1/stringlist.h --- htmlinc/stringlist.h 2000-08-07 10:56:23.000000000 +0200 +++ htmlinc-1/stringlist.h 2002-09-11 13:56:32.000000000 +0200 @@ -57,12 +57,12 @@ } }; -class MatrixIndexList: public vector { +class MatrixIndexList: public std::vector { }; -class Stringlist : public vector { +class Stringlist : public std::vector { private: Stringlist::iterator getID(Bytevector id); diff -Naur htmlinc-old/help.h htmlinc/help.h --- htmlinc/help.h 2000-08-08 09:04:28.000000000 -0400 +++ htmlinc-1/help.h 2004-03-01 19:43:43.770233421 -0500 @@ -4,25 +4,25 @@ char * helpV[]= { -{"HTML INCLUDE SYSTEM Version 1.0 beta1 - Compatible to Phase 5"}, -{"Copyright (C) 2000 , Ulli Meybohm, www.meybohm.de (GNU General Public License)"}, -{""}, -{"Start: "}, -{" htmlinc ... "}, -{""}, -{"Options:"}, -{" = Directory of the Includefiles"}, -{" = HTML-Files in which the includes should be updated"}, -{""}, -{"Examples:"}, -{" 1: htmlinc ~/www/inc/ *.html"}, -{""}, -{" 2: cd ~/www"}, -{" htmlinc inc/ `find * | grep \"\\\\.\"html` (recursive)"}, -{" "}, -{""}, -{"Report bugs to ulli@meybohm.de."}, -{""} +"HTML INCLUDE SYSTEM Version 1.0 beta1 - Compatible to Phase 5", +"Copyright (C) 2000 , Ulli Meybohm, www.meybohm.de (GNU General Public License)", +"", +"Start: ", +" htmlinc ... ", +"", +"Options:", +" = Directory of the Includefiles", +" = HTML-Files in which the includes should be updated", +"", +"Examples:", +" 1: htmlinc ~/www/inc/ *.html", +"", +" 2: cd ~/www", +" htmlinc inc/ `find * | grep \"\\\\.\"html` (recursive)", +" ", +"", +"Report bugs to ulli@meybohm.de.", +"" }; int helpC=18;