1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
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;
|