Improve unused variable warning supperssion with multi-compiler friendly code.

grafikrobot · grafikrobot · commit 2b9d29a0fc70 · 2003-10-24T01:19:16.000Z
[SVN r20466]
diff --git a/src/object/inheritance.cpp b/src/object/inheritance.cpp
@@ -35,6 +35,7 @@ namespace boost {
 namespace
 {
   enum edge_cast_t { edge_cast = 8010 };
+  template <class T> inline void unused_variable(const T&) { }
 }
 
 // Install properties
@@ -215,7 +216,7 @@ namespace
 
       vertex_t v = add_vertex(full_graph().topology());
       vertex_t v2 = add_vertex(up_graph().topology());
-      (void)v2; // prevent unused var warning on non-debug compile
+      unused_variable(v2);
       assert(v == v2);
       return type_index().insert(p, boost::make_tuple(type, v, dynamic_id_function(0)));
   }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ namespace boost {`
`35`	`35`	`namespace`
`36`	`36`	`{`
`37`	`37`	`enum edge_cast_t { edge_cast = 8010 };`
	`38`	`+ template <class T> inline void unused_variable(const T&) { }`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`// Install properties`
`@@ -215,7 +216,7 @@ namespace`
`215`	`216`
`216`	`217`	`vertex_t v = add_vertex(full_graph().topology());`
`217`	`218`	`vertex_t v2 = add_vertex(up_graph().topology());`
`218`		`- (void)v2; // prevent unused var warning on non-debug compile`
	`219`	`+ unused_variable(v2);`
`219`	`220`	`assert(v == v2);`
`220`	`221`	`return type_index().insert(p, boost::make_tuple(type, v, dynamic_id_function(0)));`
`221`	`222`	`}`