mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-04 01:37:34 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
130 lines
3.5 KiB
Diff
130 lines
3.5 KiB
Diff
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<Bytevector*> v;
|
|
+ std::vector<Bytevector*> v;
|
|
Bytevector *b;
|
|
int index=0;
|
|
int status;
|
|
@@ -152,7 +152,7 @@
|
|
|
|
|
|
void Bytevector::freadeof(int file){
|
|
- vector<Bytevector*> v;
|
|
+ std::vector<Bytevector*> 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<int> {
|
|
+class VectorIndexList : public std::vector<int> {
|
|
};
|
|
|
|
|
|
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<Bytevector *>::clear();
|
|
+ std::vector<Bytevector *>::clear();
|
|
}
|
|
|
|
|
|
@@ -373,7 +373,7 @@
|
|
|
|
void Stringlist::insert(Bytevector *b, int pos){
|
|
iterator i=begin()+pos;
|
|
- vector<Bytevector *>::insert(i,b);
|
|
+ std::vector<Bytevector *>::insert(i,b);
|
|
}
|
|
|
|
void Stringlist::insert(Bytevector &b, int pos){
|
|
@@ -417,7 +417,7 @@
|
|
|
|
|
|
Bytevector& Stringlist::operator[](int i){
|
|
- return *(vector<Bytevector *>::operator[](i));
|
|
+ return *(std::vector<Bytevector *>::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<MatrixIndex> {
|
|
+class MatrixIndexList: public std::vector<MatrixIndex> {
|
|
};
|
|
|
|
|
|
|
|
-class Stringlist : public vector<Bytevector*> {
|
|
+class Stringlist : public std::vector<Bytevector*> {
|
|
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 <include_dir> <htmlfile_1> <htmlfile_2> ... <htmlfile_n>"},
|
|
-{""},
|
|
-{"Options:"},
|
|
-{" <include_dir> = Directory of the Includefiles"},
|
|
-{" <htmlfile_i> = 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 <include_dir> <htmlfile_1> <htmlfile_2> ... <htmlfile_n>",
|
|
+"",
|
|
+"Options:",
|
|
+" <include_dir> = Directory of the Includefiles",
|
|
+" <htmlfile_i> = 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;
|