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
|
diff -aur wvstreams-3.75.0/include/uniconftree.h /tmp/wvstreams-3.75.0/include/uniconftree.h
--- wvstreams-3.75.0/include/uniconftree.h 2004-03-13 20:59:36.000000000 +0200
+++ /tmp/wvstreams-3.75.0/include/uniconftree.h 2004-09-04 16:43:30.393037423 +0300
@@ -48,7 +48,7 @@
/** Returns a pointer to the parent node, or NULL if there is none. */
Sub *parent() const
- { return static_cast<Sub*>(xparent); }
+ { return static_cast <Sub*>(this->xparent); }
/** Reparents this node. */
void setparent(Sub *parent)
@@ -56,7 +56,7 @@
/** Returns a pointer to the root node of the tree. */
Sub *root() const
- { return static_cast<Sub*>(Base::_root()); }
+ { return static_cast <Sub*>(Base::_root()); }
/**
* Returns full path of this node relative to an ancestor.
@@ -93,13 +93,13 @@
/** Removes and deletes all children of this node. */
void zap()
{
- if (!xchildren)
+ if (!(this->xchildren))
return;
// set xchildren to NULL first so that the zap() will happen faster
// otherwise, each child will attempt to unlink itself uselessly
- typename Base::Container *oldchildren = xchildren;
- xchildren = NULL;
+ typename Base::Container *oldchildren = this->xchildren;
+ this->xchildren = NULL;
// delete all children
typename Base::Container::Iter i(*oldchildren);
diff -aur wvstreams-3.75.0/include/wvscatterhash.h /tmp/wvstreams-3.75.0/include/wvscatterhash.h
--- wvstreams-3.75.0/include/wvscatterhash.h 2004-03-13 20:59:36.000000000 +0200
+++ /tmp/wvstreams-3.75.0/include/wvscatterhash.h 2004-09-04 16:25:34.378896875 +0300
@@ -154,7 +154,7 @@
{ _set_autofree(Accessor::get_key(data), hash(data), auto_free); }
bool get_autofree(const T *data)
- { _get_autofree(Accessor::get_key(data), hash(data)); }
+ { return _get_autofree(Accessor::get_key(data), hash(data)); }
void zap()
{ _zap(); }
diff -aur wvstreams-3.75.0/include/wvsorter.h /tmp/wvstreams-3.75.0/include/wvsorter.h
--- wvstreams-3.75.0/include/wvsorter.h 2004-03-13 20:59:36.000000000 +0200
+++ /tmp/wvstreams-3.75.0/include/wvsorter.h 2004-09-04 16:26:41.699819665 +0300
@@ -90,7 +90,7 @@
for (i.rewind(); i.next(); )
n++;
- array = new (void *) [n+2];
+ array = new void * [n+2];
void **aptr = array;
*aptr++ = NULL; // initial link is NULL, to act like a normal iterator
diff -aur wvstreams-3.75.0/utils/wvbuffer.cc /tmp/wvstreams-3.75.0/utils/wvbuffer.cc
--- wvstreams-3.75.0/utils/wvbuffer.cc 2004-03-13 20:59:36.000000000 +0200
+++ /tmp/wvstreams-3.75.0/utils/wvbuffer.cc 2004-09-04 16:28:40.100538512 +0300
@@ -9,13 +9,13 @@
/***** Specialization for raw memory buffers *****/
// Instantiate some commonly used templates
-template WvBufBaseCommonImpl<unsigned char>;
-template WvInPlaceBufBase<unsigned char>;
-template WvConstInPlaceBufBase<unsigned char>;
-template WvCircularBufBase<unsigned char>;
-template WvDynBufBase<unsigned char>;
-template WvNullBufBase<unsigned char>;
-template WvBufCursorBase<unsigned char>;
+template class WvBufBaseCommonImpl<unsigned char>;
+template class WvInPlaceBufBase<unsigned char>;
+template class WvConstInPlaceBufBase<unsigned char>;
+template class WvCircularBufBase<unsigned char>;
+template class WvDynBufBase<unsigned char>;
+template class WvNullBufBase<unsigned char>;
+template class WvBufCursorBase<unsigned char>;
void WvBufBase<unsigned char>::putstr(WvStringParm str)
{
|
GitWeb