From 08e7e3df15c99ab449e6a2a7b77234174cad817b Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Fri, 25 Sep 2015 02:38:59 +0200 Subject: [PATCH] prefer more readable bool operator spelling especially the '!' for negation is sometimes too terse and easily overlooked. --- src/common/advice/binding.hpp | 2 +- src/common/instancehandle.hpp | 2 +- src/common/query.hpp | 2 +- src/gui/panel/panel.cpp | 2 +- src/lib/bool-checkable.hpp | 2 +- src/lib/diff/gen-node.hpp | 10 ++++----- src/lib/diff/record.hpp | 8 +++---- src/lib/format-string.hpp | 4 ++-- src/lib/hash-indexed.hpp | 2 +- src/lib/iter-adapter-ptr-deref.hpp | 8 +++---- src/lib/iter-adapter-stl.hpp | 4 ++-- src/lib/iter-adapter.hpp | 16 +++++++------- src/lib/iter-stack.hpp | 6 ++--- src/lib/itertools.hpp | 4 ++-- src/lib/meta/function-erasure.hpp | 2 +- src/lib/polymorphic-value.hpp | 2 +- src/lib/scoped-holder.hpp | 2 +- src/lib/util.cpp | 6 ++--- src/lib/wrapper.hpp | 2 +- src/proc/asset.cpp | 10 ++++----- src/proc/control/command-argument-holder.hpp | 2 +- src/proc/control/command-closure.hpp | 2 +- src/proc/control/command-impl.hpp | 2 +- src/proc/control/command-mutation.hpp | 2 +- src/proc/control/command.hpp | 2 +- src/proc/engine/job-planning.hpp | 6 ++--- .../engine/tracking-heap-block-provider.cpp | 4 +--- src/proc/engine/type-handler.hpp | 6 ++--- src/proc/mobject/mobject-ref.hpp | 22 +++++++++---------- src/proc/mobject/session/clip.cpp | 2 +- src/proc/mobject/session/label.cpp | 2 +- src/proc/mobject/session/locatingpin.cpp | 2 +- src/proc/mobject/session/scope-path.hpp | 2 +- src/proc/play/output-slot.cpp | 6 ++--- src/proc/play/play-service.cpp | 2 +- .../meta/virtual-copy-support-test.cpp | 2 +- 36 files changed, 80 insertions(+), 82 deletions(-) diff --git a/src/common/advice/binding.hpp b/src/common/advice/binding.hpp index 39904a7c9..d62788fcb 100644 --- a/src/common/advice/binding.hpp +++ b/src/common/advice/binding.hpp @@ -244,7 +244,7 @@ namespace advice { inline bool operator!= (Binding const& b1, Binding const& b2) { - return ! (b1 == b2); + return not (b1 == b2); } diff --git a/src/common/instancehandle.hpp b/src/common/instancehandle.hpp index 9f8004c65..a9def2834 100644 --- a/src/common/instancehandle.hpp +++ b/src/common/instancehandle.hpp @@ -237,7 +237,7 @@ namespace lumiera { operator unspecified_bool_type() const // never throws { return isValid()? &_ThisType::instance_ : 0; } - bool operator! () const { return !isValid(); } + bool operator! () const { return not isValid(); } private: diff --git a/src/common/query.hpp b/src/common/query.hpp index d3a80ca4b..9ab051b60 100644 --- a/src/common/query.hpp +++ b/src/common/query.hpp @@ -212,7 +212,7 @@ namespace lumiera { inline bool operator!= (Goal::QueryID const& id1, Goal::QueryID const& id2) { - return ! (id1 == id2); + return not (id1 == id2); } diff --git a/src/gui/panel/panel.cpp b/src/gui/panel/panel.cpp index d4b18999a..d3c50a09c 100644 --- a/src/gui/panel/panel.cpp +++ b/src/gui/panel/panel.cpp @@ -133,7 +133,7 @@ namespace panel{ Panel::is_locked() const { REQUIRE(dockItem_.gobj() != NULL); - return !GDL_DOCK_ITEM_NOT_LOCKED(dockItem_.gobj()); + return not GDL_DOCK_ITEM_NOT_LOCKED(dockItem_.gobj()); } workspace::PanelManager& diff --git a/src/lib/bool-checkable.hpp b/src/lib/bool-checkable.hpp index d6e54b2de..b9c3d81f7 100644 --- a/src/lib/bool-checkable.hpp +++ b/src/lib/bool-checkable.hpp @@ -87,7 +87,7 @@ namespace lib { ValidityCheck isValid (&T::isValid); T const& obj = static_cast (*this); - return !(obj.*isValid)(); + return not (obj.*isValid)(); } diff --git a/src/lib/diff/gen-node.hpp b/src/lib/diff/gen-node.hpp index 951e7d92d..8208356e7 100644 --- a/src/lib/diff/gen-node.hpp +++ b/src/lib/diff/gen-node.hpp @@ -271,7 +271,7 @@ namespace diff{ bool isNamed() const { - return !util::startsWith (idi.getSym(), "_CHILD_"); + return not util::startsWith (idi.getSym(), "_CHILD_"); } template @@ -320,7 +320,7 @@ namespace diff{ friend bool operator!= (GenNode const& n1, GenNode const& n2) { - return ! (n1 == n2); + return not (n1 == n2); } @@ -439,7 +439,7 @@ namespace diff{ friend bool checkPoint (ScopeExplorer const& explorer) { - return !explorer.scopes_.empty() + return not explorer.scopes_.empty() && bool(explorer.scopes_.back()); } @@ -462,8 +462,8 @@ namespace diff{ friend bool operator== (ScopeExplorer const& s1, ScopeExplorer const& s2) { - return !s1.scopes_.empty() - && !s2.scopes_.empty() + return not s1.scopes_.empty() + && not s2.scopes_.empty() && s1.scopes_.size() == s2.scopes_.size() && yield(s1) == yield(s2); } diff --git a/src/lib/diff/record.hpp b/src/lib/diff/record.hpp index 6c086417d..92cd77f0b 100644 --- a/src/lib/diff/record.hpp +++ b/src/lib/diff/record.hpp @@ -335,14 +335,14 @@ namespace diff{ operator== (Record const& r1, Record const& r2) { return r1.type_ == r2.type_ - && r1.attribs_ == r2.attribs_ - && r1.children_ == r2.children_; + and r1.attribs_ == r2.attribs_ + and r1.children_ == r2.children_; } friend bool operator!= (Record const& r1, Record const& r2) { - return ! (r1 == r2); + return not (r1 == r2); } }; @@ -541,7 +541,7 @@ namespace diff{ bool empty() const { - return ! bool(record_); + return not record_; } /** target is accessed by cast diff --git a/src/lib/format-string.hpp b/src/lib/format-string.hpp index 173ebc8b8..16ab569a1 100644 --- a/src/lib/format-string.hpp +++ b/src/lib/format-string.hpp @@ -195,9 +195,9 @@ namespace util { friend bool operator== (const char * const, _Fmt const&); template - friend bool operator != (_Fmt const& fmt, X const& x) { return !(fmt == x); } + friend bool operator != (_Fmt const& fmt, X const& x) { return not (fmt == x); } template - friend bool operator != (X const& x, _Fmt const& fmt) { return !(x == fmt); } + friend bool operator != (X const& x, _Fmt const& fmt) { return not (x == fmt); } }; diff --git a/src/lib/hash-indexed.hpp b/src/lib/hash-indexed.hpp index 325b2c706..dfac2e537 100644 --- a/src/lib/hash-indexed.hpp +++ b/src/lib/hash-indexed.hpp @@ -110,7 +110,7 @@ namespace lib { operator HashVal() const { return lumiera_uid_hash (get()); } bool operator== (LuidH const& o) const { return lumiera_uid_eq (get(), o.get()); } - bool operator!= (LuidH const& o) const { return !operator== (o); } + bool operator!= (LuidH const& o) const { return not operator== (o); } /** for passing to C APIs */ LUID get() const { return const_cast (&luid_);} diff --git a/src/lib/iter-adapter-ptr-deref.hpp b/src/lib/iter-adapter-ptr-deref.hpp index 7d76ec811..65fc9e440 100644 --- a/src/lib/iter-adapter-ptr-deref.hpp +++ b/src/lib/iter-adapter-ptr-deref.hpp @@ -196,7 +196,7 @@ namespace lib { bool empty () const { - return !isValid(); + return not isValid(); } @@ -214,7 +214,7 @@ namespace lib { bool operator== (PtrDerefIter const& il, PtrDerefIter const& ir) { return il.getBase() == ir.getBase(); } template - bool operator!= (PtrDerefIter const& il, PtrDerefIter const& ir) { return !(il == ir); } + bool operator!= (PtrDerefIter const& il, PtrDerefIter const& ir) { return not (il == ir); } @@ -305,7 +305,7 @@ namespace lib { bool empty () const { - return !isValid(); + return not isValid(); } @@ -323,7 +323,7 @@ namespace lib { bool operator== (AddressExposingIter const& il, AddressExposingIter const& ir) { return il.getBase() == ir.getBase(); } template - bool operator!= (AddressExposingIter const& il, AddressExposingIter const& ir) { return !(il == ir); } + bool operator!= (AddressExposingIter const& il, AddressExposingIter const& ir) { return not (il == ir); } diff --git a/src/lib/iter-adapter-stl.hpp b/src/lib/iter-adapter-stl.hpp index 7941974f3..861bd7ccc 100644 --- a/src/lib/iter-adapter-stl.hpp +++ b/src/lib/iter-adapter-stl.hpp @@ -495,7 +495,7 @@ namespace iter_stl { bool empty () const { - return !isValid(); + return not isValid(); } @@ -511,7 +511,7 @@ namespace iter_stl { friend bool operator!= (IterSnapshot const& snap1, IterSnapshot const& snap2) { - return ! (snap1 == snap2); + return not (snap1 == snap2); } diff --git a/src/lib/iter-adapter.hpp b/src/lib/iter-adapter.hpp index 26d770694..ed1adaf66 100644 --- a/src/lib/iter-adapter.hpp +++ b/src/lib/iter-adapter.hpp @@ -213,7 +213,7 @@ namespace lib { bool empty () const { - return !isValid(); + return not isValid(); } @@ -247,7 +247,7 @@ namespace lib { void _maybe_throw() const { - if (!isValid()) + if (not isValid()) _throwIterExhausted(); } @@ -346,7 +346,7 @@ namespace lib { bool empty () const { - return !isValid(); + return not isValid(); } protected: @@ -362,7 +362,7 @@ namespace lib { void __throw_if_empty() const { - if (!isValid()) + if (not isValid()) _throwIterExhausted(); } @@ -388,7 +388,7 @@ namespace lib { template bool operator!= (IterStateWrapper const& il, IterStateWrapper const& ir) { - return ! (il == ir); + return not (il == ir); } @@ -473,7 +473,7 @@ namespace lib { bool empty () const { - return !isValid(); + return not isValid(); } @@ -592,7 +592,7 @@ namespace lib { bool empty () const { - return !isValid(); + return not isValid(); } @@ -610,7 +610,7 @@ namespace lib { bool operator== (ConstIter const& il, ConstIter const& ir) { return il.getBase() == ir.getBase(); } template - bool operator!= (ConstIter const& il, ConstIter const& ir) { return !(il == ir); } + bool operator!= (ConstIter const& il, ConstIter const& ir) { return not (il == ir); } diff --git a/src/lib/iter-stack.hpp b/src/lib/iter-stack.hpp index b67adce35..a7cb82bc8 100644 --- a/src/lib/iter-stack.hpp +++ b/src/lib/iter-stack.hpp @@ -83,20 +83,20 @@ namespace lib { friend bool checkPoint (IterDequeStorage const& elements) { - return !elements.empty(); + return not elements.empty(); } friend TY & yield (IterDequeStorage const& elements) { - REQUIRE (!elements.empty()); + REQUIRE (not elements.empty()); return unConst(elements).back(); } friend void iterNext (IterDequeStorage & elements) { - REQUIRE (!elements.empty()); + REQUIRE (not elements.empty()); elements.pop_back(); } }; diff --git a/src/lib/itertools.hpp b/src/lib/itertools.hpp index c9322f4de..4d6e622ae 100644 --- a/src/lib/itertools.hpp +++ b/src/lib/itertools.hpp @@ -226,7 +226,7 @@ namespace lib { bool empty () const { - return !isValid(); + return not isValid(); } }; @@ -245,7 +245,7 @@ namespace lib { inline bool operator!= (IterTool const& ito1, IterTool const& ito2) { - return !(ito1 == ito2); + return not (ito1 == ito2); } diff --git a/src/lib/meta/function-erasure.hpp b/src/lib/meta/function-erasure.hpp index 83f33c25e..f8b632047 100644 --- a/src/lib/meta/function-erasure.hpp +++ b/src/lib/meta/function-erasure.hpp @@ -99,7 +99,7 @@ namespace meta{ friend bool operator!= (FunErasure const& fer1, FunErasure const& fer2) { - return !(fer1==fer2); // use equality defined by FH + return not (fer1==fer2); // use equality defined by FH } }; diff --git a/src/lib/polymorphic-value.hpp b/src/lib/polymorphic-value.hpp index a3c7e651e..54d6297a6 100644 --- a/src/lib/polymorphic-value.hpp +++ b/src/lib/polymorphic-value.hpp @@ -556,7 +556,7 @@ namespace lib { friend bool operator!= (PolymorphicValue const& v1, PolymorphicValue const& v2) { - return ! (v1 == v2); + return not (v1 == v2); } }; diff --git a/src/lib/scoped-holder.hpp b/src/lib/scoped-holder.hpp index cc4bff08c..53cbd3ec3 100644 --- a/src/lib/scoped-holder.hpp +++ b/src/lib/scoped-holder.hpp @@ -233,7 +233,7 @@ namespace lib { return created_? &_ThisType::created_ : 0; } - bool operator! () const { return !created_; } + bool operator! () const { return not created_; } friend void diff --git a/src/lib/util.cpp b/src/lib/util.cpp index cebb793a4..95fb59791 100644 --- a/src/lib/util.cpp +++ b/src/lib/util.cpp @@ -38,11 +38,11 @@ namespace util { using std::function; typedef function ChPredicate; - ChPredicate operator! (ChPredicate p) { return ! bind(p,_1); } + ChPredicate operator! (ChPredicate p) { return not bind(p,_1); } // character classes used for sanitising a string - ChPredicate isValid (is_alnum() || is_any_of("-_.:+$'()@")); ///< characters to be retained - ChPredicate isPunct (is_space() || is_any_of(",;#*~´`?\\=/&%![]{}")); ///< punctuation to be replaced by '_' + ChPredicate isValid (is_alnum() or is_any_of("-_.:+$'()@")); ///< characters to be retained + ChPredicate isPunct (is_space() or is_any_of(",;#*~´`?\\=/&%![]{}")); ///< punctuation to be replaced by '_' string diff --git a/src/lib/wrapper.hpp b/src/lib/wrapper.hpp index 06f215746..007b76936 100644 --- a/src/lib/wrapper.hpp +++ b/src/lib/wrapper.hpp @@ -326,7 +326,7 @@ namespace wrapper { inline bool operator!= (ItemWrapper const& w1, ItemWrapper const& w2) { - return !(w1 == w2); + return not (w1 == w2); } diff --git a/src/proc/asset.cpp b/src/proc/asset.cpp index ca7a84706..8cc06cde4 100644 --- a/src/proc/asset.cpp +++ b/src/proc/asset.cpp @@ -97,9 +97,9 @@ namespace asset { bool Asset::Ident::isValid() const { - return !isnil (name) - && !isnil (org) - && version <= 1000000; + return not isnil (name) + and not isnil (org) + and version <= 1000000; } @@ -124,7 +124,7 @@ namespace asset { Asset::isActive () const { return this->enabled - && all_parents_enabled (parents); + and all_parents_enabled (parents); } @@ -140,7 +140,7 @@ namespace asset { { if (on == this->enabled) return true; - if (on && !all_parents_enabled (parents)) + if (on and not all_parents_enabled (parents)) return false; // can indeed to do the toggle... diff --git a/src/proc/control/command-argument-holder.hpp b/src/proc/control/command-argument-holder.hpp index 17b53a822..120ad9c78 100644 --- a/src/proc/control/command-argument-holder.hpp +++ b/src/proc/control/command-argument-holder.hpp @@ -273,7 +273,7 @@ namespace control { friend bool operator!= (ArgumentHolder const& a1, ArgumentHolder const& a2) { - return ! (a1 == a2); + return not (a1 == a2); } }; diff --git a/src/proc/control/command-closure.hpp b/src/proc/control/command-closure.hpp index ef3d4ddb0..46a808209 100644 --- a/src/proc/control/command-closure.hpp +++ b/src/proc/control/command-closure.hpp @@ -289,7 +289,7 @@ namespace control { /// Supporting equality comparisons... friend bool operator== (Closure const& c1, Closure const& c2) { return compare (c1.params_, c2.params_); } - friend bool operator!= (Closure const& c1, Closure const& c2) { return ! (c1 == c2); } + friend bool operator!= (Closure const& c1, Closure const& c2) { return not (c1 == c2); } bool equals (CmdClosure const& other) const diff --git a/src/proc/control/command-impl.hpp b/src/proc/control/command-impl.hpp index f41593699..43eaae805 100644 --- a/src/proc/control/command-impl.hpp +++ b/src/proc/control/command-impl.hpp @@ -230,7 +230,7 @@ namespace control { friend bool operator!= (CommandImpl const& ci1, CommandImpl const& ci2) { - return !(ci1==ci2); + return not (ci1==ci2); } }; diff --git a/src/proc/control/command-mutation.hpp b/src/proc/control/command-mutation.hpp index b80259a09..7147c839d 100644 --- a/src/proc/control/command-mutation.hpp +++ b/src/proc/control/command-mutation.hpp @@ -104,7 +104,7 @@ namespace control { friend bool operator!= (Mutation const& m1, Mutation const& m2) { - return !(m1==m2); + return not (m1==m2); } }; diff --git a/src/proc/control/command.hpp b/src/proc/control/command.hpp index 4067e9383..ed865ce3a 100644 --- a/src/proc/control/command.hpp +++ b/src/proc/control/command.hpp @@ -261,7 +261,7 @@ namespace control { inline bool operator!= (Command const& c1, Command const& c2) { - return ! (c1 == c2); + return not (c1 == c2); } /** allow for sets and associative containers */ diff --git a/src/proc/engine/job-planning.hpp b/src/proc/engine/job-planning.hpp index 0362547cf..1a6f1da23 100644 --- a/src/proc/engine/job-planning.hpp +++ b/src/proc/engine/job-planning.hpp @@ -178,7 +178,7 @@ namespace engine { friend bool checkPoint (JobPlanning const& plan) { - return !isnil (plan.plannedOperations_); + return not isnil (plan.plannedOperations_); } friend JobPlanning& @@ -302,8 +302,8 @@ namespace engine { bool canContinue (FrameCoord const& location) { - return !isEndOfChunk (location.absoluteFrameNumber, - location.modelPort); + return not isEndOfChunk (location.absoluteFrameNumber, + location.modelPort); } protected: diff --git a/src/proc/engine/tracking-heap-block-provider.cpp b/src/proc/engine/tracking-heap-block-provider.cpp index ed056bbce..3ca8d68d5 100644 --- a/src/proc/engine/tracking-heap-block-provider.cpp +++ b/src/proc/engine/tracking-heap-block-provider.cpp @@ -194,11 +194,9 @@ namespace engine { static bool is_in_sane_state (Block const& block) { - return !block.was_used() - || block.was_closed(); + return not block.was_used() or block.was_closed(); } }; - } diff --git a/src/proc/engine/type-handler.hpp b/src/proc/engine/type-handler.hpp index db55f64b3..4ceb80abb 100644 --- a/src/proc/engine/type-handler.hpp +++ b/src/proc/engine/type-handler.hpp @@ -148,7 +148,7 @@ namespace engine { isValid() const { return bool(createAttached) - && bool(destroyAttached); + and bool(destroyAttached); } friend HashVal @@ -166,7 +166,7 @@ namespace engine { friend bool operator== (TypeHandler const& left, TypeHandler const& right) { - return (!left.isValid() && !right.isValid()) + return (not left.isValid() and not right.isValid()) || ( util::rawComparison(left.createAttached, right.createAttached) && util::rawComparison(left.destroyAttached, right.destroyAttached) ); @@ -174,7 +174,7 @@ namespace engine { friend bool operator!= (TypeHandler const& left, TypeHandler const& right) { - return !(left == right); + return not (left == right); } }; diff --git a/src/proc/mobject/mobject-ref.hpp b/src/proc/mobject/mobject-ref.hpp index 5fdb9aec6..e5eafdf6f 100644 --- a/src/proc/mobject/mobject-ref.hpp +++ b/src/proc/mobject/mobject-ref.hpp @@ -311,8 +311,8 @@ namespace mobject { bool operator!= (MORef const& oRef) const { - return !isValid() - || oRef != this->pRef_; + return not isValid() + or oRef != this->pRef_; } template @@ -320,15 +320,15 @@ namespace mobject { operator== (MORef const& oRef, PlacementRef const& pRef) { return oRef.isValid() - && oRef.pRef_ == pRef; + and oRef.pRef_ == pRef; } template friend bool operator!= (MORef const& oRef, PlacementRef const& pRef) { - return !oRef.isValid() - || oRef.pRef_ != pRef; + return not oRef.isValid() + or oRef.pRef_ != pRef; } template @@ -336,29 +336,29 @@ namespace mobject { operator== (PlacementRef const& pRef, MORef const& oRef) { return oRef.isValid() - && pRef == oRef.pRef_; + and pRef == oRef.pRef_; } template friend bool operator!= (PlacementRef const& pRef, MORef const& oRef) { - return !oRef.isValid() - || pRef != oRef.pRef_; + return not oRef.isValid() + or pRef != oRef.pRef_; } bool operator== (PlacementMO::ID const& pID) const { return isValid() - && PlacementMO::ID (pRef_) == pID; + and PlacementMO::ID (pRef_) == pID; } bool operator!= (PlacementMO::ID const& pID) const { - return !isValid() - || PlacementMO::ID (pRef_) != pID; + return not isValid() + or PlacementMO::ID (pRef_) != pID; } }; diff --git a/src/proc/mobject/session/clip.cpp b/src/proc/mobject/session/clip.cpp index bb5fdeb74..1461be405 100644 --- a/src/proc/mobject/session/clip.cpp +++ b/src/proc/mobject/session/clip.cpp @@ -55,7 +55,7 @@ namespace session { Clip::isValid () const { TODO ("check consistency of clip length def, implies accessing the underlying media def"); - return !isnil(length_); + return not isnil(length_); } diff --git a/src/proc/mobject/session/label.cpp b/src/proc/mobject/session/label.cpp index 3ffa028e6..f14c1520b 100644 --- a/src/proc/mobject/session/label.cpp +++ b/src/proc/mobject/session/label.cpp @@ -35,7 +35,7 @@ namespace session { bool Label::isValid() const { - return !isnil (typeID_); + return not isnil (typeID_); } diff --git a/src/proc/mobject/session/locatingpin.cpp b/src/proc/mobject/session/locatingpin.cpp index 7a79a7777..de85b98f3 100644 --- a/src/proc/mobject/session/locatingpin.cpp +++ b/src/proc/mobject/session/locatingpin.cpp @@ -169,7 +169,7 @@ namespace session { bool LocatingPin::LocatingSolution::still_to_solve () { - return !(is_definite() || is_impossible()); + return not (is_definite() or is_impossible()); } diff --git a/src/proc/mobject/session/scope-path.hpp b/src/proc/mobject/session/scope-path.hpp index 5546037f5..0d1b25bdc 100644 --- a/src/proc/mobject/session/scope-path.hpp +++ b/src/proc/mobject/session/scope-path.hpp @@ -216,7 +216,7 @@ namespace session { inline bool operator!= (ScopePath const& path1, ScopePath const& path2) { - return !(path1 == path2); + return not (path1 == path2); } diff --git a/src/proc/play/output-slot.cpp b/src/proc/play/output-slot.cpp index 87eaf5051..e063aaf81 100644 --- a/src/proc/play/output-slot.cpp +++ b/src/proc/play/output-slot.cpp @@ -56,7 +56,7 @@ namespace play { bool OutputSlot::isFree() const { - return ! this->state_; + return not this->state_; } @@ -77,7 +77,7 @@ namespace play { OutputSlot::Allocation& OutputSlot::allocate() { - if (!isFree()) + if (not isFree()) throw error::Logic ("Attempt to open/allocate an OutputSlot already in use."); state_.reset (this->buildState()); @@ -88,7 +88,7 @@ namespace play { void OutputSlot::disconnect() { - if (!isFree()) + if (not isFree()) state_.reset(0); } diff --git a/src/proc/play/play-service.cpp b/src/proc/play/play-service.cpp index 94f37a591..b3824585d 100644 --- a/src/proc/play/play-service.cpp +++ b/src/proc/play/play-service.cpp @@ -124,7 +124,7 @@ namespace play { bool isActive() const { - return ! and_all (processes_, isDead); + return not and_all (processes_, isDead); } private: diff --git a/tests/library/meta/virtual-copy-support-test.cpp b/tests/library/meta/virtual-copy-support-test.cpp index d36b0fae1..fce2e9180 100644 --- a/tests/library/meta/virtual-copy-support-test.cpp +++ b/tests/library/meta/virtual-copy-support-test.cpp @@ -125,7 +125,7 @@ namespace test { virtual bool empty() const { - return !bool(access()); + return not access(); }