forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
/
crystalspace-2.0-gcc47.patch
110 lines (100 loc) · 3.41 KB
/
crystalspace-2.0-gcc47.patch
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
https://bugs.gentoo.org/426870
https://bugs.gentoo.org/459440
include/csplugincommon/rendermanager/render.h | 6 +++---
include/csutil/blockallocator.h | 6 +++---
include/csutil/parray.h | 2 +-
include/csutil/redblacktree.h | 4 ++--
include/csutil/refarr.h | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
--- a/include/csplugincommon/rendermanager/render.h
+++ b/include/csplugincommon/rendermanager/render.h
@@ -194,7 +194,7 @@ namespace RenderManager
|| (mesh.preCopyNum != 0))
{
// Render the latest batch of meshes
- RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
+ this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
lastRenderedMesh = m;
lastShader = shader;
@@ -208,7 +208,7 @@ namespace RenderManager
}
}
- RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
+ this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
}
};
@@ -242,7 +242,7 @@ namespace RenderManager
iShader* shader = context.shaderArray[mesh.contextLocalId+layerOffset];
size_t ticket = context.ticketArray[mesh.contextLocalId+layerOffset];
- RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
+ this->RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
}
}
}
--- a/include/csutil/blockallocator.h
+++ b/include/csutil/blockallocator.h
@@ -193,7 +193,7 @@ public:
~csBlockAllocator()
{
ObjectDispose dispose (*this, false);
- DisposeAll (dispose);
+ this->DisposeAll (dispose);
}
/**
@@ -204,7 +204,7 @@ public:
void Empty ()
{
ObjectDispose dispose (*this, true);
- FreeAll (dispose);
+ this->FreeAll (dispose);
}
/**
@@ -215,7 +215,7 @@ public:
void DeleteAll ()
{
ObjectDispose dispose (*this, true);
- DisposeAll (dispose);
+ this->DisposeAll (dispose);
}
/**
--- a/include/csutil/parray.h
+++ b/include/csutil/parray.h
@@ -112,7 +112,7 @@ public:
{
CS_ASSERT (this->GetSize () > 0);
T* ret = GetAndClear (this->GetSize () - 1); // see *1*
- Truncate (this->GetSize () - 1);
+ this->Truncate (this->GetSize () - 1);
return ret;
}
--- a/include/csutil/redblacktree.h
+++ b/include/csutil/redblacktree.h
@@ -1155,7 +1155,7 @@ public:
T* Put (const K& key, const T &value)
{
csRedBlackTreePayload<K, T>* payload = (csRedBlackTreePayload<K, T>*)
- Insert (csRedBlackTreePayload<K, T>(key, value));
+ this->Insert (csRedBlackTreePayload<K, T>(key, value));
return (payload != 0) ? &payload->GetValue() : 0;
}
/**
@@ -1194,7 +1194,7 @@ public:
*/
const T& Get (const K& key, const T& fallback) const
{
- const csRedBlackTreePayload<K, T>* payload = Find (key);
+ const csRedBlackTreePayload<K, T>* payload = this->Find (key);
if (payload == 0) return fallback;
return payload->GetValue();
}
--- a/include/csutil/refarr.h
+++ b/include/csutil/refarr.h
@@ -111,7 +111,7 @@ public:
{
CS_ASSERT (this->GetSize () > 0);
csRef<T> ret = this->Get (this->GetSize () - 1); // see *1*
- SetSize (this->GetSize () - 1);
+ this->SetSize (this->GetSize () - 1);
return ret;
}
};