diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-21 10:33:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-21 10:33:45 +0400 |
commit | be53fde9cde872003d5895f628e457289cd6b594 (patch) | |
tree | 4d1c0dd81eb04bbbd65d290eba0a03207edd3c05 | |
parent | 000ac36290b1253b4593453bfeb29686a5704e2d (diff) |
code cleanup:
- remove duplicate includes
- blender builds with -Werror in C++ for fluids/smoke
-rw-r--r-- | intern/elbeem/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index 064269b02bc..e9d29561121 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -86,9 +86,12 @@ set(SRC 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 diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index abc31bb25ed..a89cb042884 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -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 @@ enum { MESHCMP_POLYMISMATCH, MESHCMP_EDGEUNKNOWN, MESHCMP_VERTCOMISMATCH, - MESHCMP_CDLAYERS_MISMATCH, + MESHCMP_CDLAYERS_MISMATCH }; static const char *cmpcode_to_str(int code) diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 4b814a5b22b..51183511454 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -103,7 +103,7 @@ static void tend ( void ) { 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 @@ static void tend ( void ) 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 ); |