blob: 5305a9004fa788f8db8775549638af7eb021b518 (
plain)
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
|
--- QSlimLib-1.5.4/src/mixkit/MxDynBlock.h 2009-05-18 22:04:02.783721647 +0200
+++ QSlimLib-1.5.4/src/mixkit/MxDynBlock.h.new 2009-05-18 22:14:07.010554394 +0200
@@ -35,7 +35,7 @@
void room_for(int len)
{
- if( length()<len ) resize(len);
+ if( length()<len ) this->resize(len);
fill = len;
}
--- QSlimLib-1.5.4/src/mixkit/MxDynBlock.h 2009-05-18 22:20:40.238540252 +0200
+++ QSlimLib-1.5.4/src/mixkit/MxDynBlock.h.new 2009-05-18 22:21:22.416124721 +0200
@@ -62,8 +62,8 @@
//
int size() const { return length(); }
- typename MxBlock<T>::iterator end() { return begin()+size(); }
- typename MxBlock<T>::const_iterator end() const { return begin()+size(); }
+ typename MxBlock<T>::iterator end() { return this->begin()+size(); }
+ typename MxBlock<T>::const_iterator end() const { return this->begin()+size(); }
void push_back(const T& t) { add(t); }
};
--- QSlimLib-1.5.4/src/mixkit/MxStack.h 2004-10-25 23:02:10.000000000 +0200
+++ QSlimLib-1.5.4/src/mixkit/MxStack.h.new 2009-05-18 22:25:01.804175361 +0200
@@ -26,12 +26,12 @@
MxStack(const T& val, unsigned int n) : MxDynBlock<T>(n)
{ push(val); }
- T& top() { return last(); }
- const T& top() const { return last(); }
+ T& top() { return this->last(); }
+ const T& top() const { return this->last(); }
- bool is_empty() { return length()==0; }
+ bool is_empty() { return this->length()==0; }
- T& pop() { return drop(); }
+ T& pop() { return this->drop(); }
void push(const T& val) { add(val); }
//
@@ -41,7 +41,7 @@
// broken! The top() will grab a pointer into the block,
// but the add() may reallocate the block before doing the
// assignment. Thus, the pointer will become invalid.
- void push() { add(); top() = (*this)[length()-2]; }
+ void push() { this->add(); top() = (*this)[this->length()-2]; }
};
// MXSTACK_INCLUDED
|
GitWeb
