1 From 54a2debd94c3e8df3b6f1e579f1db02dae61cbb7 Mon Sep 17 00:00:00 2001
2 From: "Mark W. Krentel" <krentel@rice.edu>
3 Date: Fri, 1 Feb 2019 13:14:11 -0600
4 Subject: [PATCH] Add some explicit casts from boost::tribool to bool for some
7 Add some explicit casts from boost::tribool to bool for some code in dataflowAPI/rose/util/Message.[Ch]. This was breaking the build when using boost >= 1.69.
9 dataflowAPI/rose/util/Message.C | 2 +-
10 dataflowAPI/rose/util/Message.h | 3 ++-
11 2 files changed, 3 insertions(+), 2 deletions(-)
13 diff --git a/dataflowAPI/rose/util/Message.C b/dataflowAPI/rose/util/Message.C
14 index a8a66ad4c..5e276f97d 100644
15 --- a/dataflowAPI/rose/util/Message.C
16 +++ b/dataflowAPI/rose/util/Message.C
17 @@ -1123,7 +1123,7 @@ StreamBuf::bake() {
18 destination_->bakeDestinations(message_.properties(), baked_/*out*/);
19 anyUnbuffered_ = false;
20 for (BakedDestinations::const_iterator bi=baked_.begin(); bi!=baked_.end() && !anyUnbuffered_; ++bi)
21 - anyUnbuffered_ = !bi->second.isBuffered;
22 + anyUnbuffered_ = static_cast<bool>(!bi->second.isBuffered);
26 diff --git a/dataflowAPI/rose/util/Message.h b/dataflowAPI/rose/util/Message.h
27 index 816f68d2e..03592cb97 100644
28 --- a/dataflowAPI/rose/util/Message.h
29 +++ b/dataflowAPI/rose/util/Message.h
30 @@ -386,7 +386,8 @@ struct SAWYER_EXPORT ColorSpec {
31 ColorSpec(AnsiColor fg, AnsiColor bg, bool bold): foreground(fg), background(bg), bold(bold) {}
33 /** Returns true if this object is in its default-constructed state. */
34 - bool isDefault() const { return COLOR_DEFAULT==foreground && COLOR_DEFAULT==background && !bold; }
35 + bool isDefault() const { return COLOR_DEFAULT==foreground && COLOR_DEFAULT==background
36 + && static_cast<bool>(!bold); }
39 /** Colors to use for each message importance.