[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47130] trunk/blender/source/blender/ blenlib: style cleanup: also fix for TIMEIT macro

[Campbell Barton]

Revision: 47130
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47130
Author:   campbellbarton
Date:     2012-05-28 18:12:08 +0000 (Mon, 28 May 2012)
Log Message:
-----------
style cleanup: also fix for TIMEIT macro

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_utildefines.h
    trunk/blender/source/blender/blenlib/PIL_time.h

Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h	2012-05-28 17:47:42 UTC (rev 47129)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h	2012-05-28 18:12:08 UTC (rev 47130)
@@ -148,29 +148,29 @@
 		*(v1) =   *(v2);                                                      \
 		*(v1 + 1) = *(v2 + 1);                                                \
 } (void)0
-#define VECADD(v1, v2, v3) {                                                   \
-		*(v1) =   *(v2)   + *(v3);                                             \
-		*(v1 + 1) = *(v2 + 1) + *(v3 + 1);                                     \
-		*(v1 + 2) = *(v2 + 2) + *(v3 + 2);                                     \
+#define VECADD(v1, v2, v3) {                                                  \
+		*(v1) =   *(v2)   + *(v3);                                            \
+		*(v1 + 1) = *(v2 + 1) + *(v3 + 1);                                    \
+		*(v1 + 2) = *(v2 + 2) + *(v3 + 2);                                    \
 } (void)0
-#define VECSUB(v1, v2, v3) {                                                   \
-		*(v1) =   *(v2)   - *(v3);                                             \
-		*(v1 + 1) = *(v2 + 1) - *(v3 + 1);                                     \
-		*(v1 + 2) = *(v2 + 2) - *(v3 + 2);                                     \
+#define VECSUB(v1, v2, v3) {                                                  \
+		*(v1) =   *(v2)   - *(v3);                                            \
+		*(v1 + 1) = *(v2 + 1) - *(v3 + 1);                                    \
+		*(v1 + 2) = *(v2 + 2) - *(v3 + 2);                                    \
 } (void)0
-#define VECSUB2D(v1, v2, v3)     {                                             \
-		*(v1) =   *(v2)   - *(v3);                                             \
-		*(v1 + 1) = *(v2 + 1) - *(v3 + 1);                                     \
+#define VECSUB2D(v1, v2, v3)     {                                            \
+		*(v1) =   *(v2)   - *(v3);                                            \
+		*(v1 + 1) = *(v2 + 1) - *(v3 + 1);                                    \
 } (void)0
-#define VECADDFAC(v1, v2, v3, fac) {                                           \
-		*(v1) =   *(v2)   + *(v3) * (fac);                                     \
-		*(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (fac);                             \
-		*(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac);                             \
+#define VECADDFAC(v1, v2, v3, fac) {                                          \
+		*(v1) =   *(v2)   + *(v3) * (fac);                                    \
+		*(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (fac);                            \
+		*(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac);                            \
 } (void)0
-#define VECSUBFAC(v1, v2, v3, fac) {                                           \
-		*(v1) =   *(v2)   - *(v3) * (fac);                                     \
-		*(v1 + 1) = *(v2 + 1) - *(v3 + 1) * (fac);                             \
-		*(v1 + 2) = *(v2 + 2) - *(v3 + 2) * (fac);                             \
+#define VECSUBFAC(v1, v2, v3, fac) {                                          \
+		*(v1) =   *(v2)   - *(v3) * (fac);                                    \
+		*(v1 + 1) = *(v2 + 1) - *(v3 + 1) * (fac);                            \
+		*(v1 + 2) = *(v2 + 2) - *(v3 + 2) * (fac);                            \
 } (void)0
 
 #define INPR(v1, v2) ( (v1)[0] * (v2)[0] + (v1)[1] * (v2)[1] + (v1)[2] * (v2)[2])
@@ -223,7 +223,7 @@
 #define SWITCH_SHORT(a) {                                                     \
 		char s_i, *p_i;                                                       \
 		p_i = (char *)&(a);                                                   \
-		s_i = p_i[0]; p_i[0] = p_i[1]; p_i[1] = s_i;                           \
+		s_i = p_i[0]; p_i[0] = p_i[1]; p_i[1] = s_i;                          \
 	} (void)0
 
 

Modified: trunk/blender/source/blender/blenlib/PIL_time.h
===================================================================
--- trunk/blender/source/blender/blenlib/PIL_time.h	2012-05-28 17:47:42 UTC (rev 47129)
+++ trunk/blender/source/blender/blenlib/PIL_time.h	2012-05-28 18:12:08 UTC (rev 47130)
@@ -61,7 +61,7 @@
 		double _timeit_##var = PIL_check_seconds_timer();                     \
 		printf("time start (" #var "):  " AT "\n");                           \
 		fflush(stdout);                                                       \
-		{ (void)                                                              \
+		{ (void)0                                                             \
 
 
 #define TIMEIT_VALUE(var) (float)(PIL_check_seconds_timer() - _timeit_##var)
@@ -71,7 +71,7 @@
 	}                                                                         \
 	printf("time end   (" #var "): %.6f" "  " AT "\n",  TIMEIT_VALUE(var));   \
 	fflush(stdout);                                                           \
-} (void)                                                                      \
+} (void)0                                                                     \
 
 #ifdef __cplusplus
 }