From: Manuel López-Ibáñez <manu@gcc.gnu.org>
Date: Thu, 13 Nov 2014 10:46:56 +0000 (+0000)
Subject: line-map.h: Include EXPR, so that unused variable warnings do not occur.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d82f1e13053446d0b0fd8e8e3b26f5d7e579bfd7;p=gcc.git

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 b75d521cf9f..5814dc4da18 100644
--- 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 2fcee1906be..edcbdc9bd66 100644
--- 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