[SM-Commit] PERFORCE change 79924 by Flavien Bridault for review

Perforce Review Daemon p4review at smee.org
Mon May 29 05:35:01 EDT 2006


Change 79924 by flavien_bridault at flavien-Gargamel on 2006/05/29 10:33:25

	integrate bugfix for #11949 from devel

Affected files ...

... //sgl/grimoires/test/graphics/gsculpt/BUILD#2 integrate
... //sgl/grimoires/test/graphics/gsculpt/HISTORY#7 integrate
... //sgl/grimoires/test/graphics/gsculpt/PRE_BUILD#1 branch
... //sgl/grimoires/test/graphics/gsculpt/gSculpt-0.3-gcc3.patch#2 integrate

Differences ...

==== //sgl/grimoires/test/graphics/gsculpt/BUILD#2 (xtext) ====

@@ -1,2 +1,1 @@
-patch  -p1  <  $SCRIPT_DIRECTORY/gSculpt-0.3-gcc3.patch  &&
 make

==== //sgl/grimoires/test/graphics/gsculpt/HISTORY#7 (text) ====

@@ -1,3 +1,10 @@
+2006-05-29 Flavien Bridault <vlaaad at sourcemage.org>
+        * PRE_BUILD: added to apply patch
+        * BUILD: removed patch applying from there
+        * gSculpt-0.3-gcc3.patch: updated to remove a default parameter
+          value set to an another parameter (removed the constructor
+          since it was never used in the program) (bug#11949)
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/graphics/gsculpt/gSculpt-0.3-gcc3.patch#2 (text) ====

@@ -220,3 +220,27 @@
  					: ToolModifyModel(v, pman, funcName, optTitle, tableWidth)
  {
  }
+diff -uNr gSculpt-0.3.old/src/Templates/array.h gSculpt-0.3/src/Templates/array.h
+--- gSculpt-0.3.old/src/Templates/array.h	2006-05-29 11:21:06.000000000 +0200
++++ gSculpt-0.3/src/Templates/array.h	2006-05-29 11:21:32.000000000 +0200
+@@ -99,20 +99,6 @@
+ 		calcEnd();
+ 	}
+ 
+-	//construct from C array
+-	array(T *inData, int aSize, int initialCap = aSize)
+-	{
+-		sz = aSize;
+-		cap = initialCap;
+-		dlt = __array_defaultDelta;
+-		data = new T[cap];
+-		for (int i = 0; i < sz; i++)
+-		{
+-			data[i] = inData[i];
+-		}
+-		calcEnd();
+-	}
+-	
+ 	//construct from C array (2)
+ 	array(T *inData, int aSize, int initialCap, int delta)
+ 	{



More information about the SM-Commit mailing list