[Bf-blender-cvs] [3fcedae8c83] master: Cleanup: extra semicolon, comma warnings

[Campbell Barton]

Commit: 3fcedae8c83584607c1c9d7488a6ba2c623fde0b
Author: Campbell Barton
Date:   Sat Sep 21 11:34:39 2019 +1000
Branches: master
https://developer.blender.org/rB3fcedae8c83584607c1c9d7488a6ba2c623fde0b

Cleanup: extra semicolon, comma warnings

===================================================================

M	intern/cycles/util/util_hash.h
M	source/blender/draw/intern/draw_cache_extract_mesh.c
M	source/blender/gpu/intern/gpu_framebuffer.c

===================================================================

diff --git a/intern/cycles/util/util_hash.h b/intern/cycles/util/util_hash.h
index 53140e40fc9..ca48758efcd 100644
--- a/intern/cycles/util/util_hash.h
+++ b/intern/cycles/util/util_hash.h
@@ -47,7 +47,8 @@ CCL_NAMESPACE_BEGIN
     c -= b; \
     c ^= rot(b, 4); \
     b += a; \
-  }
+  } \
+  ((void)0)
 
 #define final(a, b, c) \
   { \
@@ -65,7 +66,8 @@ CCL_NAMESPACE_BEGIN
     b -= rot(a, 14); \
     c ^= b; \
     c -= rot(b, 24); \
-  }
+  } \
+  ((void)0)
 
 ccl_device_inline uint hash_uint(uint kx)
 {
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c
index d7971a9e7db..eb0ddbc825e 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh.c
@@ -949,10 +949,8 @@ BLI_INLINE void lines_adjacency_triangle(
   GPUIndexBufBuilder *elb = &data->elb;
   /* Iter around the triangle's edges. */
   for (int e = 0; e < 3; e++) {
-    uint tmp = v1;
-    v1 = v2, v2 = v3, v3 = tmp;
-    tmp = l1;
-    l1 = l2, l2 = l3, l3 = tmp;
+    SHIFT3(uint, v3, v2, v1);
+    SHIFT3(uint, l3, l2, l1);
 
     bool inv_indices = (v2 > v3);
     void **pval;
@@ -4329,7 +4327,8 @@ void mesh_buffer_cache_create_requested(MeshBatchCache *cache,
   if (mbc.buf.name) { \
     extract_task_create( \
         task_pool, mr, &extract_##name, mbc.buf.name, &task_counters[counter_used++]); \
-  }
+  } \
+  ((void)0)
 
   EXTRACT(vbo, pos_nor);
   EXTRACT(vbo, lnor);
diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index 1b68e4c85f7..a531c22365c 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -132,9 +132,11 @@ static void gpu_print_framebuffer_error(GLenum status, char err_out[256])
   const char *err = "unknown";
 
 #define FORMAT_STATUS(X) \
-  case GL_FRAMEBUFFER_##X: \
+  case GL_FRAMEBUFFER_##X: { \
     err = "GL_FRAMEBUFFER_" #X; \
-    break;
+    break; \
+  } \
+    ((void)0)
 
   switch (status) {
     /* success */