Merge pull request #145 from facebookresearch/no-semicolon-in-macro

prigoyal · web-flow · commit 87bd535b869f · 2018-03-13T10:19:09.000-04:00
do not emit semicolon after if_then_else macro
diff --git a/include/tc/core/libraries.h b/include/tc/core/libraries.h
@@ -144,7 +144,7 @@ constexpr auto boundsAsTemplate = R"C(
 template<typename T> inline __device__ T floord(T n, T d) {
   return n < 0 ? - (-n + d - 1)/d : n / d;
 }
-#define if_then_else(cond,a,b) (cond) ? (a) : (b);
+#define if_then_else(cond,a,b) ((cond) ? (a) : (b))
 )C";
 } // namespace cpp
 

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ constexpr auto boundsAsTemplate = R"C(`
`144`	`144`	`template<typename T> inline __device__ T floord(T n, T d) {`
`145`	`145`	`return n < 0 ? - (-n + d - 1)/d : n / d;`
`146`	`146`	`}`
`147`		`-#define if_then_else(cond,a,b) (cond) ? (a) : (b);`
	`147`	`+#define if_then_else(cond,a,b) ((cond) ? (a) : (b))`
`148`	`148`	`)C";`
`149`	`149`	`} // namespace cpp`
`150`	`150`