summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwl <wl>2011-07-03 19:33:57 +0000
committerwl <wl>2011-07-03 19:33:57 +0000
commitbd05661fc1383f4f7e34deec55124d321354523e (patch)
tree0ea32c7db300bf757dce0e8907e57b729ab3bb85
parent913afc956fceb518761e66a32cb9c9de94469fc0 (diff)
downloadgroff-bd05661fc1383f4f7e34deec55124d321354523e.tar.gz
Fix clang warnings.
* src/libs/libdriver/input.cpp (odd): Use parentheses. * src/roff/troff/mtsm.cpp (state_set::is_in): Fix parentheses; previous code always tested for bit 0.
-rw-r--r--ChangeLog11
-rw-r--r--src/libs/libdriver/input.cpp5
-rw-r--r--src/roff/troff/mtsm.cpp6
3 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 19e30a5b..b2a7641b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2011-06-03 Guillem Jover <guillem@debian.org>
+2011-07-03 Ben Laurie <benl@FreeBSD.org>
+
+ Fix clang warnings.
+
+ * src/libs/libdriver/input.cpp (odd): Use parentheses.
+
+ * src/roff/troff/mtsm.cpp (state_set::is_in): Fix parentheses;
+ previous code always tested for bit 0.
+
+2011-07-03 Guillem Jover <guillem@debian.org>
mdoc: Update more OS versions strings.
diff --git a/src/libs/libdriver/input.cpp b/src/libs/libdriver/input.cpp
index 3d837882..42438ad6 100644
--- a/src/libs/libdriver/input.cpp
+++ b/src/libs/libdriver/input.cpp
@@ -2,8 +2,7 @@
// <groff_src_dir>/src/libs/libdriver/input.cpp
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005,
- 2006, 2008, 2009, 2010
+/* Copyright (C) 1989-1992, 2001-2006, 2008-2011
Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -995,7 +994,7 @@ next_command(void)
inline bool
odd(const int n)
{
- return (n & 1 == 1) ? true : false;
+ return ((n & 1) == 1) ? true : false;
}
//////////////////////////////////////////////////////////////////////
diff --git a/src/roff/troff/mtsm.cpp b/src/roff/troff/mtsm.cpp
index 79e2f78f..83f1bd21 100644
--- a/src/roff/troff/mtsm.cpp
+++ b/src/roff/troff/mtsm.cpp
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 2003, 2004, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2009, 2011 Free Software Foundation, Inc.
Written by Gaius Mulley (gaius@glam.ac.uk)
This file is part of groff.
@@ -610,12 +610,12 @@ int state_set::is_in(int_value_state i)
int state_set::is_in(units_value_state u)
{
- return (unitsset & (1 << (int)u) != 0);
+ return (unitsset & (1 << (int)u)) != 0;
}
int state_set::is_in(string_value_state s)
{
- return (stringset & (1 << (int)s) != 0);
+ return (stringset & (1 << (int)s)) != 0;
}
void state_set::add(units_value_state, int n)