[Gemrb-commits] gemrb: branch master updated. v0.6.6-61-g00c3f35

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  00c3f358e4b2ff9ef03d0ac46790beca830e13b6 (commit)

Summary of changes:
 gemrb/plugins/GUIScript/GUIScript.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
      from  196878b2ea33969bd460a4880946956cf2f0cc16 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=00c3f358e4b2ff9ef03d0ac46790beca830e13b6

commit 00c3f358e4b2ff9ef03d0ac46790beca830e13b6
Author: Brad Allred <bra...@me...>
Date:   Tue Nov 1 14:06:30 2011 -0600

    better fix for clang compiler warning.

diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
index d08185b..d5deff0 100644
--- a/gemrb/plugins/GUIScript/GUIScript.cpp
+++ b/gemrb/plugins/GUIScript/GUIScript.cpp
@@ -1229,10 +1229,12 @@ static PyObject* GemRB_Window_GetControl(PyObject * /*self*/, PyObject* args)
 	}
 
 	PyObject* ctrltuple = PyTuple_New(2);
-	int py_index = 0;//use index variable to supress false positive clang warning about indexing past end of array.
-	PyTuple_SET_ITEM(ctrltuple, py_index, PyInt_FromLong(WindowIndex));
-	PyTuple_SET_ITEM(ctrltuple, ++py_index, PyInt_FromLong(ctrlindex));
-
+//supress false positive clang warning about indexing past end of array.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warray-bounds"
+	PyTuple_SET_ITEM(ctrltuple, 0, PyInt_FromLong(WindowIndex));
+	PyTuple_SET_ITEM(ctrltuple, 1, PyInt_FromLong(ctrlindex));
+#pragma clang diagnostic pop
 	PyObject* ret = 0;
 	Control *ctrl = GetControl(WindowIndex, ctrlindex, -1);
 	if (!ctrl) {

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator