* [gentoo-commits] gentoo-x86 commit in dev-games/crystalspace/files: crystalspace-2.0-gcc47.patch
@ 2013-01-24 0:16 Julian Ospald (hasufell)
0 siblings, 0 replies; 2+ messages in thread
From: Julian Ospald (hasufell) @ 2013-01-24 0:16 UTC (permalink / raw
To: gentoo-commits
hasufell 13/01/24 00:16:26
Added: crystalspace-2.0-gcc47.patch
Log:
version bump wrt #453138
(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.1 dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch?rev=1.1&content-type=text/plain
Index: crystalspace-2.0-gcc47.patch
===================================================================
--- include/csutil/blockallocator.h
+++ include/csutil/blockallocator.h
@@ -193,7 +193,7 @@
~csBlockAllocator()
{
ObjectDispose dispose (*this, false);
- DisposeAll (dispose);
+ this->DisposeAll (dispose);
}
/**
@@ -215,7 +215,7 @@
void DeleteAll ()
{
ObjectDispose dispose (*this, true);
- DisposeAll (dispose);
+ this->DisposeAll (dispose);
}
/**
--- include/csutil/parray.h
+++ include/csutil/parray.h
@@ -112,7 +112,7 @@
{
CS_ASSERT (this->GetSize () > 0);
T* ret = GetAndClear (this->GetSize () - 1); // see *1*
- Truncate (this->GetSize () - 1);
+ this->Truncate (this->GetSize () - 1);
return ret;
}
--- include/csutil/refarr.h
+++ include/csutil/refarr.h
@@ -111,7 +111,7 @@
{
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;
}
};
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-games/crystalspace/files: crystalspace-2.0-gcc47.patch
@ 2013-03-03 8:22 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Hill (dirtyepic) @ 2013-03-03 8:22 UTC (permalink / raw
To: gentoo-commits
dirtyepic 13/03/03 08:22:03
Modified: crystalspace-2.0-gcc47.patch
Log:
Further build fixes for GCC 4.7 (bug #459440).
(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key 957A8463)
Revision Changes Path
1.2 dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch?r1=1.1&r2=1.2
Index: crystalspace-2.0-gcc47.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crystalspace-2.0-gcc47.patch 24 Jan 2013 00:16:26 -0000 1.1
+++ crystalspace-2.0-gcc47.patch 3 Mar 2013 08:22:03 -0000 1.2
@@ -1,6 +1,45 @@
---- include/csutil/blockallocator.h
-+++ include/csutil/blockallocator.h
-@@ -193,7 +193,7 @@
+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);
@@ -9,7 +48,16 @@
}
/**
-@@ -215,7 +215,7 @@
+@@ -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);
@@ -18,9 +66,9 @@
}
/**
---- include/csutil/parray.h
-+++ include/csutil/parray.h
-@@ -112,7 +112,7 @@
+--- 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*
@@ -29,9 +77,29 @@
return ret;
}
---- include/csutil/refarr.h
-+++ include/csutil/refarr.h
-@@ -111,7 +111,7 @@
+--- 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*
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-03 8:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-03 8:22 [gentoo-commits] gentoo-x86 commit in dev-games/crystalspace/files: crystalspace-2.0-gcc47.patch Ryan Hill (dirtyepic)
-- strict thread matches above, loose matches on Subject: below --
2013-01-24 0:16 Julian Ospald (hasufell)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox