[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16630] trunk/blender/source/blender: Patch 17403, small gcc warning fixes.

[Ton Roosendaal]

Revision: 16630
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16630
Author:   ton
Date:     2008-09-20 14:26:18 +0200 (Sat, 20 Sep 2008)

Log Message:
-----------
Patch 17403, small gcc warning fixes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/blenlib/intern/edgehash.c

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2008-09-20 11:54:27 UTC (rev 16629)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2008-09-20 12:26:18 UTC (rev 16630)
@@ -3339,7 +3339,7 @@
 void writeBobjgz(char *filename, struct Object *ob, int useGlobalCoords, int append, float time) 
 {
 	char debugStrBuffer[256];
-	int wri,i,j,totvert,totface;
+	int wri=0,i,j,totvert,totface;
 	float wrf;
 	gzFile gzf;
 	DerivedMesh *dm;

Modified: trunk/blender/source/blender/blenlib/intern/edgehash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/edgehash.c	2008-09-20 11:54:27 UTC (rev 16629)
+++ trunk/blender/source/blender/blenlib/intern/edgehash.c	2008-09-20 12:26:18 UTC (rev 16630)
@@ -77,8 +77,12 @@
 	unsigned int hash;
 	Entry *e= malloc(sizeof(*e));
 
-	if (v1<v0) v0 ^= v1 ^= v0 ^= v1;
-	hash = EDGEHASH(v0,v1)%eh->nbuckets;
+	if (v1<v0) {
+		v0 ^= v1;
+		v1 ^= v0;
+		v0 ^= v1;
+	}
+ 	hash = EDGEHASH(v0,v1)%eh->nbuckets;
 
 	e->v0 = v0;
 	e->v1 = v1;
@@ -114,7 +118,11 @@
 	unsigned int hash;
 	Entry *e;
 
-	if (v1<v0) v0 ^= v1 ^= v0 ^= v1;
+	if (v1<v0) {
+		v0 ^= v1;
+		v1 ^= v0;
+		v0 ^= v1;
+	}
 	hash = EDGEHASH(v0,v1)%eh->nbuckets;
 	for (e= eh->buckets[hash]; e; e= e->next)
 		if (v0==e->v0 && v1==e->v1)