[sword-svn] r3275 - in branches/sword-1-7-x: . bindings

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-12-02 22:56:54 -0700 (Tue, 02 Dec 2014)
New Revision: 3275

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/bindings/flatapi.cpp
Log:
Merged r3230



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225,3230

Modified: branches/sword-1-7-x/bindings/flatapi.cpp
===================================================================
--- branches/sword-1-7-x/bindings/flatapi.cpp	2014-12-03 05:48:59 UTC (rev 3274)
+++ branches/sword-1-7-x/bindings/flatapi.cpp	2014-12-03 05:56:54 UTC (rev 3275)
@@ -70,7 +70,7 @@
 }
 
 
-void clearModInfo(org_crosswire_sword_ModInfo **modInfo) {
+void clearModInfoArray(org_crosswire_sword_ModInfo **modInfo) {
 	if (*modInfo) {
 		for (int i = 0; true; ++i) {
 			if ((*modInfo)[i].name) {
@@ -221,7 +221,7 @@
 	}
 
 	void clearModInfo() {
-		::clearModInfo(&modInfo);
+		clearModInfoArray(&modInfo);
 	}
 
 	~HandleSWMgr() {
@@ -289,7 +289,7 @@
 	}
 
 	void clearModInfo() {
-		::clearModInfo(&modInfo);
+		clearModInfoArray(&modInfo);
 	}
 };