aboutsummaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorManuel López-Ibáñez <manu@gcc.gnu.org>2014-11-13 10:46:56 +0000
committerMartin Liska <marxin@gcc.gnu.org>2014-11-13 10:46:56 +0000
commitd82f1e13053446d0b0fd8e8e3b26f5d7e579bfd7 (patch)
tree81d2acd8afd87312c239b2825b3142047212b0b5 /libcpp
parent0ed4f879945c6e171f00fa010e047c79bf269548 (diff)
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
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog5
-rw-r--r--libcpp/include/line-map.h3
2 files changed, 7 insertions, 1 deletions
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