[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46826] trunk/blender: code cleanup:

[Campbell Barton]

Revision: 46826
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46826
Author:   campbellbarton
Date:     2012-05-21 06:33:45 +0000 (Mon, 21 May 2012)
Log Message:
-----------
code cleanup:
- remove duplicate includes
- blender builds with -Werror in C++ for fluids/smoke

Modified Paths:
--------------
    trunk/blender/intern/elbeem/CMakeLists.txt
    trunk/blender/source/blender/blenkernel/intern/mesh.c
    trunk/blender/source/blender/blenkernel/intern/smoke.c

Modified: trunk/blender/intern/elbeem/CMakeLists.txt
===================================================================
--- trunk/blender/intern/elbeem/CMakeLists.txt	2012-05-21 06:33:32 UTC (rev 46825)
+++ trunk/blender/intern/elbeem/CMakeLists.txt	2012-05-21 06:33:45 UTC (rev 46826)
@@ -86,9 +86,12 @@
 	intern/solver_interface.h
 	intern/solver_relax.h
 	intern/utilities.h
-    intern/globals.h
+	intern/globals.h
 )
 
+# elbeem has some harmless UNUSED warnings
+remove_strict_flags()
+
 add_definitions(
 	-DNOGUI
 	-DELBEEM_BLENDER=1

Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c	2012-05-21 06:33:32 UTC (rev 46825)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c	2012-05-21 06:33:45 UTC (rev 46826)
@@ -50,6 +50,7 @@
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
 #include "BLI_scanfill.h"
+#include "BLI_array.h"
 
 #include "BKE_animsys.h"
 #include "BKE_main.h"
@@ -70,11 +71,6 @@
 #include "BKE_tessmesh.h"
 #include "BLI_edgehash.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_array.h"
-#include "BLI_edgehash.h"
-
 #include "bmesh.h"
 
 enum {
@@ -88,7 +84,7 @@
 	MESHCMP_POLYMISMATCH,
 	MESHCMP_EDGEUNKNOWN,
 	MESHCMP_VERTCOMISMATCH,
-	MESHCMP_CDLAYERS_MISMATCH,
+	MESHCMP_CDLAYERS_MISMATCH
 };
 
 static const char *cmpcode_to_str(int code)

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-05-21 06:33:32 UTC (rev 46825)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-05-21 06:33:45 UTC (rev 46826)
@@ -103,7 +103,7 @@
 {
 	QueryPerformanceCounter ( &liCurrentTime );
 }
-static double tval( void )
+static double UNUSED_FUNCTION(tval)( void )
 {
 	return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart ));
 }
@@ -120,7 +120,7 @@
 	gettimeofday ( &_tend,&tz );
 }
 
-static double tval( void )
+static double UNUSED_FUNCTION(tval)( void )
 {
 	double t1, t2;
 	t1 = ( double ) _tstart.tv_sec*1000 + ( double ) _tstart.tv_usec/ ( 1000 );