line-map.h: Include EXPR, so that unused variable warnings do not occur.

	* include/line-map.h: Include EXPR, so that unused variable warnings
	do not occur.

From-SVN: r217473

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index b75d521cf9fbb620cf91065f6da227e53aace15e..5814dc4da18c66ff0e92b01e508bb4e1a5e3ea49 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-13  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       * include/line-map.h: Include EXPR, so that unused variable warnings
+       do not occur.
+
 2014-11-11  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
        PR fortran/44054

diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index 2fcee1906bea500b8a138edefad9b756f9351876..edcbdc9bd661d2595914f5d3cce88b9cef657287 100644 (file)
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -586,7 +586,8 @@ bool linemap_location_from_macro_expansion_p (const struct line_maps *,
   ({linemap_assert (!linemap_macro_expansion_map_p (LINE_MAP)); \
     (LINE_MAP);})
 #else
-#define linemap_assert(EXPR)
+/* Include EXPR, so that unused variable warnings do not occur.  */
+#define linemap_assert(EXPR) ((void)(0 && (EXPR)))
 #define linemap_check_ordinary(LINE_MAP) (LINE_MAP)
 #endif