diff --git a/research/try.cpp b/research/try.cpp index 89a9c7d3e..095cdfa63 100644 --- a/research/try.cpp +++ b/research/try.cpp @@ -74,7 +74,6 @@ typedef unsigned int uint; #include "lib/meta/trait.hpp" #include "lib/format-cout.hpp" -#include #include #include #include diff --git a/src/common/advice/binding.hpp b/src/common/advice/binding.hpp index d62788fcb..8b92bbd99 100644 --- a/src/common/advice/binding.hpp +++ b/src/common/advice/binding.hpp @@ -80,10 +80,10 @@ #include "lib/hash-value.h" #include "lib/query-util.hpp" -#include #include #include + namespace lumiera{ namespace advice { @@ -221,12 +221,6 @@ namespace advice { }; - inline std::ostream& - operator<< (std::ostream& os, Binding const& bi) - { - return os << string(bi); - } - template inline Binding const& Binding::addTypeGuard() diff --git a/src/common/advice/index.hpp b/src/common/advice/index.hpp index c04f1af72..de9360c5a 100644 --- a/src/common/advice/index.hpp +++ b/src/common/advice/index.hpp @@ -91,13 +91,13 @@ #include "lib/symbol.hpp" #include "include/logging.h" #include "lib/iter-adapter-stl.hpp" +#include "lib/format-util.hpp" #include "lib/util-foreach.hpp" #include "lib/util.hpp" #include "common/advice/binding.hpp" #include #include -#include #include namespace lumiera{ @@ -109,6 +109,7 @@ namespace advice { using std::unordered_map; using lib::iter_stl::eachVal; using lib::iter_stl::eachElm; + using util::str; using util::for_each; using util::contains; using util::unConst; @@ -116,9 +117,6 @@ namespace advice { using std::string; using std::vector; using std::pair; - using std::ostream; - using std::cout; - using std::endl; @@ -165,6 +163,12 @@ namespace advice { // using default-copy, thus assuming copy is NO_THROW + + operator string() const ///< diagnostics + { + return "E-" +hash_value(this->first) +"--> "+ this->second ; + } + friend bool operator== (Entry const& a, Entry const& b) { @@ -176,12 +180,6 @@ namespace advice { { return a.second == &p; } - - friend ostream& - operator<< (ostream& os, Entry const& ent) - { - return os << "E-"< " << ent.second ; - } }; @@ -241,12 +239,12 @@ namespace advice { return false; } - void - dump() ///< debugging helper: Cluster contents --> STDOUT + operator string() const ///< debugging helper: show Cluster contents { - cout << "elmList("<< elms_.size()<<")" << endl; - for (EIter i=elms_.begin(); i!=elms_.end(); ++i) - cout << "E...:"<< (*i) << endl; + string dump{"elmList("+str(elms_.size())+")\n"}; + for (auto const& entry : elms_) + dump += "E...:"+entry+"\n"; + return dump; } lib::RangeIter diff --git a/src/common/basic-setup.cpp b/src/common/basic-setup.cpp index afcdf3529..4087b17e9 100644 --- a/src/common/basic-setup.cpp +++ b/src/common/basic-setup.cpp @@ -30,7 +30,6 @@ extern "C" { #include } #include -#include #include diff --git a/src/common/option.cpp b/src/common/option.cpp index 3a14497d0..1408ff861 100644 --- a/src/common/option.cpp +++ b/src/common/option.cpp @@ -86,7 +86,7 @@ namespace lumiera { if (isHelp()) { - std::cerr << *this; + cerr << *this; exit(-1); } if (isConfigDefs()) diff --git a/src/common/option.hpp b/src/common/option.hpp index 1d706e5d5..e400702e3 100644 --- a/src/common/option.hpp +++ b/src/common/option.hpp @@ -25,9 +25,9 @@ #define LUMIERA_OPTION_H #include "lib/cmdline.hpp" +#include "lib/format-cout.hpp" #include -#include #include #include diff --git a/src/gui/widget/menu-button.hpp b/src/gui/widget/menu-button.hpp index d9a62415c..1da6d4aae 100644 --- a/src/gui/widget/menu-button.hpp +++ b/src/gui/widget/menu-button.hpp @@ -26,8 +26,6 @@ #include "gui/gtk-base.hpp" -#include - namespace gui { diff --git a/src/lib/cmdline.cpp b/src/lib/cmdline.cpp index bc10e664d..174039840 100644 --- a/src/lib/cmdline.cpp +++ b/src/lib/cmdline.cpp @@ -37,7 +37,6 @@ using boost::algorithm::join; using util::noneg; -#include namespace lib { diff --git a/src/lib/cmdline.hpp b/src/lib/cmdline.hpp index f65db650b..2dba98262 100644 --- a/src/lib/cmdline.hpp +++ b/src/lib/cmdline.hpp @@ -26,7 +26,6 @@ #include #include -#include @@ -61,9 +60,6 @@ namespace lib { }; - /** for outputting Cmdline objects */ - inline ostream& operator<< (ostream& os, const Cmdline& cmdL) { return os << (string (cmdL)); } - } // namespace lib diff --git a/src/lib/idi/entry-id.hpp b/src/lib/idi/entry-id.hpp index 2ad062f5f..3c237589a 100644 --- a/src/lib/idi/entry-id.hpp +++ b/src/lib/idi/entry-id.hpp @@ -50,7 +50,6 @@ #include #include -#include #include @@ -256,7 +255,6 @@ namespace idi { operator string() const; - friend ostream& operator<< (ostream& os, EntryID const& id) { return os << string(id); } friend bool operator< (EntryID const& i1, EntryID const& i2) { return i1.getSym() < i2.getSym(); } }; diff --git a/src/lib/sub-id.hpp b/src/lib/sub-id.hpp index e504b2592..38ec49bc3 100644 --- a/src/lib/sub-id.hpp +++ b/src/lib/sub-id.hpp @@ -38,7 +38,7 @@ ** ** @todo 1/2016 this idea seems very reasonable, and we should just make it ** robust and usable, along the lines pointed out by that draft - ** - remove the `` and `format-util` dependency (!) + ** - remove the `format-util` dependency (!) ////////////////////////////////TICKET #985 ** - provide a hash implementation for real ** - extend to arbitrary number of sub-dimensions (variadic) ** - implement comparisons as you'd do for any algebraic type @@ -59,17 +59,13 @@ //#include #include /////TODO better push the hash implementation into a cpp file (and btw, do it more seriously!) -#include #include namespace lib { using boost::hash_value; - - using std::ostream; using std::string; - using std::cout; @@ -88,12 +84,6 @@ namespace lib { }; - inline ostream& - operator<< (ostream& os, SubID const& sID) - { - return os << string(sID); - } - inline size_t hash_value (SubID const& sID) { diff --git a/src/lib/test/event-log.hpp b/src/lib/test/event-log.hpp index a98613071..a520317ab 100644 --- a/src/lib/test/event-log.hpp +++ b/src/lib/test/event-log.hpp @@ -48,11 +48,11 @@ #include "lib/iter-adapter.hpp" #include "lib/iter-cursor.hpp" #include "lib/format-util.hpp" +#include "lib/format-cout.hpp" #include "lib/diff/record.hpp" #include "lib/symbol.hpp" #include "lib/util.hpp" -#include #include #include #include @@ -317,7 +317,7 @@ namespace test{ { if (!isnil (violation_)) { - std::cerr << "__Log_condition_violated__\n"+violation_ <<"\n"; + cerr << "__Log_condition_violated__\n"+violation_ <<"\n"; return false; } return true; diff --git a/src/lib/test/suite.cpp b/src/lib/test/suite.cpp index 9e3947427..32b121daf 100644 --- a/src/lib/test/suite.cpp +++ b/src/lib/test/suite.cpp @@ -234,7 +234,7 @@ namespace test { // Instantiate all tests cases and execute them. for ( TestMap::iterator i=tests->begin(); i!=tests->end(); ++i ) { - std::cout << "\n ----------"<< i->first<< "----------\n"; + cout << "\n ----------"<< i->first<< "----------\n"; Launcher* test = (i->second); IS_VALID (test, i->first); exitCode_ |= invokeTestCase (*test->makeInstance(), cmdline); // actually no cmdline arguments diff --git a/src/lib/time/diagnostics.hpp b/src/lib/time/diagnostics.hpp index 7689e8257..717396b93 100644 --- a/src/lib/time/diagnostics.hpp +++ b/src/lib/time/diagnostics.hpp @@ -47,7 +47,6 @@ #include "lib/time/timevalue.hpp" #include "lib/time.h" -#include #include @@ -55,14 +54,6 @@ namespace lib { namespace time { - /** writes time value, formatted as HH:MM:SS:mmm - * @see lumiera_tmpbuf_print_time */ - inline std::ostream& - operator<< (std::ostream& os, TimeValue const& t) - { - return os << std::string(Time(t)); - } - /* === H:M:S:mm component diagnostics === */ diff --git a/src/lib/time/display.hpp b/src/lib/time/display.hpp deleted file mode 100644 index 2fa093767..000000000 --- a/src/lib/time/display.hpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - DISPLAY.hpp - formatting of time values for display - - Copyright (C) Lumiera.org - 2010, Hermann Vosseler - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - - -#ifndef LIB_TIME_DISPLAY_H -#define LIB_TIME_DISPLAY_H - -#include "lib/time/timecode.hpp" -#include "lib/time/digxel.hpp" - -#include -#include - - - -namespace lib { -namespace time { - - - /* === shortcuts for diagnostic output === */ - - /** writes time value, formatted as HH:MM:SS:mmm */ - inline std::ostream& operator<< (std::ostream& os, Time const& t) { return os << string(t); } - inline std::ostream& operator<< (std::ostream& os, TCode const& t) { return os << string(t); } - - /** display a single timecode component */ - template< typename NUM, class FMT> - inline std::ostream& operator<< (std::ostream& os, Digxel const& d) { return os << string(d); } - - - -}} // lib::time -#endif diff --git a/src/lib/time/timecode.hpp b/src/lib/time/timecode.hpp index 8c93aa966..0493afdb7 100644 --- a/src/lib/time/timecode.hpp +++ b/src/lib/time/timecode.hpp @@ -29,7 +29,6 @@ #include "lib/time/digxel.hpp" #include "lib/symbol.hpp" -//#include #include #include ///////////////TODO #include diff --git a/src/lib/verb-token.hpp b/src/lib/verb-token.hpp index 9d0cbdc73..2328e2f3b 100644 --- a/src/lib/verb-token.hpp +++ b/src/lib/verb-token.hpp @@ -91,7 +91,7 @@ namespace lib { return (receiver.*handler_)(std::forward(args)...); } - operator string() + operator string() const { return string(token_); } diff --git a/src/proc/asset.cpp b/src/proc/asset.cpp index 8cc06cde4..09927cd91 100644 --- a/src/proc/asset.cpp +++ b/src/proc/asset.cpp @@ -23,7 +23,6 @@ #include "proc/asset.hpp" #include "proc/assetmanager.hpp" -#include "proc/asset/asset-format.hpp" #include "lib/format-string.hpp" #include "lib/util-foreach.hpp" #include "lib/util.hpp" diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp index 7efdff764..3bbb7b228 100644 --- a/src/proc/asset.hpp +++ b/src/proc/asset.hpp @@ -348,21 +348,6 @@ namespace asset { ID ID::INVALID = ID(0); - /** convenient for debugging - * @deprecated to be obsoleted by automatically using - * custom string conversion in ostreams - */ - inline string str (PcAsset const& a) - { - if (a) - return string (*a.get()); - else - return "Asset(NULL)"; - } - - - - }} // namespace proc::asset diff --git a/src/proc/asset/asset-format.hpp b/src/proc/asset/asset-format.hpp deleted file mode 100644 index ec3ffd5b3..000000000 --- a/src/proc/asset/asset-format.hpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - ASSET-FORMAT.hpp - helpers for display of asset entities - - Copyright (C) Lumiera.org - 2011, Hermann Vosseler - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - - -#ifndef ASSET_ASSET_FORMAT_H -#define ASSET_ASSET_FORMAT_H - -#include "proc/asset.hpp" -#include "proc/asset/category.hpp" - -#include - - - -namespace proc { -namespace asset { - - - inline std::ostream& - operator<< (std::ostream& os, Category const& cat) - { - return os << string(cat); - } - - inline std::ostream& - operator<< (std::ostream& os, Asset::Ident const& idi) - { - return os << string(idi); - } - - - - -}} // namespace proc::asset -#endif diff --git a/src/proc/asset/meta/time-grid.cpp b/src/proc/asset/meta/time-grid.cpp index 409282f67..a56e89b5e 100644 --- a/src/proc/asset/meta/time-grid.cpp +++ b/src/proc/asset/meta/time-grid.cpp @@ -26,7 +26,6 @@ #include "proc/assetmanager.hpp" #include "lib/time/quantiser.hpp" #include "lib/time/timevalue.hpp" -#include "lib/time/display.hpp" #include "lib/format-string.hpp" #include "common/advice.hpp" #include "lib/util.hpp" diff --git a/src/proc/asset/struct-scheme.hpp b/src/proc/asset/struct-scheme.hpp index ab5a837a5..f9abc4127 100644 --- a/src/proc/asset/struct-scheme.hpp +++ b/src/proc/asset/struct-scheme.hpp @@ -39,12 +39,10 @@ #include "lib/symbol.hpp" #include "proc/asset.hpp" #include "lib/idi/entry-id.hpp" +#include "lib/format-string.hpp" #include -/////////////////////////////////////////////////////////TICKET #166 : needs to be pushed down into a *.cpp -#include -using boost::format; namespace proc { diff --git a/src/proc/asset/typed-id.hpp b/src/proc/asset/typed-id.hpp index 0822e07e6..f3bd31763 100644 --- a/src/proc/asset/typed-id.hpp +++ b/src/proc/asset/typed-id.hpp @@ -54,8 +54,6 @@ //#include #include -//#include -//#include namespace lumiera{ ///////TODO: shouldn't that be namespace lib? or proc? namespace query { diff --git a/src/proc/control/command-closure.hpp b/src/proc/control/command-closure.hpp index c2dbb1b3d..ec3265240 100644 --- a/src/proc/control/command-closure.hpp +++ b/src/proc/control/command-closure.hpp @@ -74,14 +74,13 @@ #include "lib/meta/function-erasure.hpp" #include "lib/meta/tuple.hpp" #include "lib/meta/maybe-compare.hpp" -#include "lib/format-util.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include "proc/control/argument-erasure.hpp" #include "lib/typed-allocation-manager.hpp" #include #include -#include #include #include @@ -184,7 +183,7 @@ namespace control { ostream& dump (ostream& output) const { - return BASE::dump (output << util::str (element()) << ','); //////////////////TICKET #985 : make str obsolete! + return BASE::dump (output << element() << ','); } friend bool diff --git a/src/proc/control/command-mutation.hpp b/src/proc/control/command-mutation.hpp index 7147c839d..ca9a9c6c2 100644 --- a/src/proc/control/command-mutation.hpp +++ b/src/proc/control/command-mutation.hpp @@ -50,18 +50,11 @@ #include "proc/control/command-closure.hpp" #include "proc/control/memento-tie.hpp" -#include -#include - namespace proc { namespace control { - using std::ostream; - using std::string; - - /** diff --git a/src/proc/control/styperegistry.hpp b/src/proc/control/styperegistry.hpp index 5b799aa08..e2a0583b0 100644 --- a/src/proc/control/styperegistry.hpp +++ b/src/proc/control/styperegistry.hpp @@ -45,7 +45,6 @@ //#include //#include //#include -//#include #include @@ -54,7 +53,6 @@ namespace control { // using std::string; -// using boost::format; namespace impl { } // (End) impl namespace diff --git a/src/proc/mobject/test-dummy-mobject.hpp b/src/proc/mobject/test-dummy-mobject.hpp index 9966b53b0..8a02b552b 100644 --- a/src/proc/mobject/test-dummy-mobject.hpp +++ b/src/proc/mobject/test-dummy-mobject.hpp @@ -46,17 +46,16 @@ #include "proc/mobject/session/abstractmo.hpp" #include "proc/mobject/placement.hpp" #include "lib/format-string.hpp" +#include "lib/format-cout.hpp" #include "lib/symbol.hpp" #include "lib/util.hpp" -#include #include using util::_Fmt; using util::cStr; using std::string; using std::rand; -using std::cout; diff --git a/tests/basics/streamtypebasicstest.cpp b/tests/basics/streamtypebasicstest.cpp index 53f8a6809..a211248ac 100644 --- a/tests/basics/streamtypebasicstest.cpp +++ b/tests/basics/streamtypebasicstest.cpp @@ -27,8 +27,6 @@ #include "proc/control/stypemanager.hpp" #include "teststreamtypes.hpp" -#include -using std::cout; using ::test::Test; using util::isnil; diff --git a/tests/basics/streamtypelifecycletest.cpp b/tests/basics/streamtypelifecycletest.cpp index fcfcf164a..ea69e7324 100644 --- a/tests/basics/streamtypelifecycletest.cpp +++ b/tests/basics/streamtypelifecycletest.cpp @@ -29,8 +29,6 @@ //#include "teststreamtypes.hpp" #include "include/lifecycle.h" -#include -using std::cout; diff --git a/tests/basics/time/digxel-configurations-test.cpp b/tests/basics/time/digxel-configurations-test.cpp index 1481b5ce7..6e70ee6f6 100644 --- a/tests/basics/time/digxel-configurations-test.cpp +++ b/tests/basics/time/digxel-configurations-test.cpp @@ -23,20 +23,17 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "lib/time/display.hpp" #include "lib/time/digxel.hpp" +#include "lib/format-cout.hpp" #include "lib/error.hpp" #include "lib/util.hpp" -#include #include using lumiera::error::LUMIERA_ERROR_ASSERTION; using util::isSameObject; using lib::test::showType; using std::rand; -using std::cout; -using std::endl; namespace lib { diff --git a/tests/basics/time/digxel-test.cpp b/tests/basics/time/digxel-test.cpp index c3e891f28..2a3a78936 100644 --- a/tests/basics/time/digxel-test.cpp +++ b/tests/basics/time/digxel-test.cpp @@ -22,22 +22,19 @@ #include "lib/test/run.hpp" +#include "lib/format-cout.hpp" #include "lib/format-string.hpp" #include "lib/test/test-helper.hpp" -#include "lib/time/display.hpp" #include "lib/time/digxel.hpp" #include "lib/util.hpp" #include #include -#include using lumiera::error::LUMIERA_ERROR_ASSERTION; using util::isSameObject; using util::isnil; using std::rand; -using std::cout; -using std::endl; namespace lib { diff --git a/tests/basics/time/time-basics-test.cpp b/tests/basics/time/time-basics-test.cpp index 7e5ef6dd8..4e1cd3b99 100644 --- a/tests/basics/time/time-basics-test.cpp +++ b/tests/basics/time/time-basics-test.cpp @@ -22,22 +22,17 @@ #include "lib/test/run.hpp" - +#include "lib/time/timevalue.hpp" +#include "lib/time/diagnostics.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" + #include -#include #include using boost::lexical_cast; using util::isnil; using std::rand; -using std::cout; -using std::endl; - - -#include "lib/time/timevalue.hpp" -#include "lib/time/diagnostics.hpp" - namespace lib { diff --git a/tests/basics/time/time-control-test.cpp b/tests/basics/time/time-control-test.cpp index 77b32b74c..52426ecda 100644 --- a/tests/basics/time/time-control-test.cpp +++ b/tests/basics/time/time-control-test.cpp @@ -30,18 +30,16 @@ #include "lib/meta/generator-combinations.hpp" #include "proc/asset/meta/time-grid.hpp" #include "lib/scoped-holder.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include -#include #include #include using lib::test::showType; using boost::lexical_cast; using util::isnil; -using std::cout; -using std::endl; using std::string; diff --git a/tests/basics/time/time-formats-test.cpp b/tests/basics/time/time-formats-test.cpp index a4498cfee..040259a1a 100644 --- a/tests/basics/time/time-formats-test.cpp +++ b/tests/basics/time/time-formats-test.cpp @@ -27,11 +27,10 @@ #include "lib/time/timequant.hpp" #include "lib/time/timecode.hpp" #include "lib/time/mutation.hpp" -#include "lib/time/display.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include -#include #include #include @@ -39,8 +38,6 @@ using boost::lexical_cast; using util::isnil; using std::rand; using std::string; -using std::cout; -using std::endl; namespace lib { diff --git a/tests/basics/time/time-quantisation-test.cpp b/tests/basics/time/time-quantisation-test.cpp index 617a8d620..24eff8eb6 100644 --- a/tests/basics/time/time-quantisation-test.cpp +++ b/tests/basics/time/time-quantisation-test.cpp @@ -25,22 +25,16 @@ #include "lib/test/test-helper.hpp" #include "proc/asset/meta/time-grid.hpp" #include "lib/time/timequant.hpp" -#include "lib/time/display.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include -#include -#include #include using boost::lexical_cast; using util::isnil; using util::contains; using std::rand; -using std::cout; -using std::endl; - -using boost::algorithm::join; namespace lib { diff --git a/tests/basics/time/time-value-test.cpp b/tests/basics/time/time-value-test.cpp index 67667e3b1..d26a7cc8e 100644 --- a/tests/basics/time/time-value-test.cpp +++ b/tests/basics/time/time-value-test.cpp @@ -24,17 +24,14 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "lib/time/timevalue.hpp" -#include "lib/time/display.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include -#include #include using boost::lexical_cast; using util::isnil; -using std::cout; -using std::endl; using std::string; using lumiera::error::LUMIERA_ERROR_BOTTOM_VALUE; diff --git a/tests/basics/visitingtool-concept.cpp b/tests/basics/visitingtool-concept.cpp index 550fc3fa5..128962e34 100644 --- a/tests/basics/visitingtool-concept.cpp +++ b/tests/basics/visitingtool-concept.cpp @@ -54,15 +54,14 @@ #include "lib/test/run.hpp" +#include "lib/format-cout.hpp" +#include "lib/format-string.hpp" #include "lib/depend.hpp" -#include -#include #include -using boost::format; +using util::_Fmt; using std::string; -using std::cout; namespace lumiera { @@ -373,7 +372,7 @@ namespace lumiera { protected: void talk_to (string guy) { - cout << format ("Hello %s, nice to meet you...\n") % guy; + cout << _Fmt{"Hello %s, nice to meet you...\n"} % guy; } }; diff --git a/tests/basics/visitingtool-extended-test.cpp b/tests/basics/visitingtool-extended-test.cpp index 755cae2d0..85e79b882 100644 --- a/tests/basics/visitingtool-extended-test.cpp +++ b/tests/basics/visitingtool-extended-test.cpp @@ -23,11 +23,11 @@ #include "lib/test/run.hpp" #include "lib/visitor.hpp" +#include "lib/format-string.hpp" -#include #include -using boost::format; +using util::_Fmt; using std::string; using std::cout; @@ -64,7 +64,7 @@ namespace test2 { protected: void talk_to (string guy) { - cout << format ("Hello %s, nice to meet you...\n") % guy; + cout << _Fmt{"Hello %s, nice to meet you...\n"} % guy; } }; diff --git a/tests/basics/visitingtool-test.cpp b/tests/basics/visitingtool-test.cpp index b852ce2c3..a868aa3a8 100644 --- a/tests/basics/visitingtool-test.cpp +++ b/tests/basics/visitingtool-test.cpp @@ -23,11 +23,11 @@ #include "lib/test/run.hpp" #include "lib/visitor.hpp" +#include "lib/format-string.hpp" -#include #include -using boost::format; +using util::_Fmt; using std::string; using std::cout; @@ -73,7 +73,7 @@ namespace test1 { protected: void talk_to (string guy) { - cout << format ("Hello %s, nice to meet you...\n") % guy; + cout << _Fmt{"Hello %s, nice to meet you...\n"} % guy; } }; diff --git a/tests/core/application/subsystem-runner-test.cpp b/tests/core/application/subsystem-runner-test.cpp index ad1590ef5..e838d7e9c 100644 --- a/tests/core/application/subsystem-runner-test.cpp +++ b/tests/core/application/subsystem-runner-test.cpp @@ -30,14 +30,13 @@ #include "lib/symbol.hpp" #include "backend/thread-wrapper.hpp" #include "lib/query-util.hpp" +#include "lib/format-cout.hpp" #include "lib/error.hpp" #include "lib/util.hpp" #include "lib/sync.hpp" #include -#include -using std::cout; using std::bind; using util::isnil; using util::cStr; @@ -231,9 +230,6 @@ namespace test { operator string () const { return "MockSys(\""+id_+"\")"; } - friend inline ostream& - operator<< (ostream& os, MockSys const& subsys) { return os << string(subsys); } - bool didRun () const { return didRun_; } }; diff --git a/tests/core/backend/media-access-mock-test.cpp b/tests/core/backend/media-access-mock-test.cpp index d71613ef5..6b316b9e6 100644 --- a/tests/core/backend/media-access-mock-test.cpp +++ b/tests/core/backend/media-access-mock-test.cpp @@ -24,17 +24,16 @@ #include "backend/media-access-facade.hpp" #include "backend/media-access-mock.hpp" #include "lib/test/depend-4test.hpp" +#include "lib/format-cout.hpp" #include "lib/test/run.hpp" -#include "lib/time/diagnostics.hpp" #include "lib/symbol.hpp" -#include +#include using lib::test::Depend4Test; using lib::Literal; using std::string; -using std::cout; namespace backend { diff --git a/tests/core/proc/asset/asset-category-test.cpp b/tests/core/proc/asset/asset-category-test.cpp index 71addafeb..86f4e9a64 100644 --- a/tests/core/proc/asset/asset-category-test.cpp +++ b/tests/core/proc/asset/asset-category-test.cpp @@ -22,18 +22,16 @@ #include "lib/test/run.hpp" +#include "lib/format-cout.hpp" #include "lib/format-string.hpp" #include "lib/util.hpp" #include "proc/asset/category.hpp" -#include "proc/asset/asset-format.hpp" -#include using util::_Fmt; using util::isnil; using std::string; -using std::cout; namespace proc { diff --git a/tests/core/proc/asset/asset-diagnostics.hpp b/tests/core/proc/asset/asset-diagnostics.hpp index 69dfd0024..4f93636cb 100644 --- a/tests/core/proc/asset/asset-diagnostics.hpp +++ b/tests/core/proc/asset/asset-diagnostics.hpp @@ -35,11 +35,11 @@ #include "proc/assetmanager.hpp" #include "lib/format-string.hpp" +#include "lib/format-cout.hpp" #include "lib/util-foreach.hpp" #include "lib/util.hpp" #include -#include using util::contains; using util::for_each; @@ -61,7 +61,7 @@ namespace asset { else { _Fmt fmt("%s %|50T.| id=%s adr=%p smart-ptr=%p use-count=%u"); - cout << fmt % str(aa) % aa->getID() % aa.get() % &aa % (aa.use_count() - 1) << "\n"; ////////////TICKET #985 : make str obsolete + cout << fmt % aa % aa->getID() % aa.get() % &aa % (aa.use_count() - 1) << "\n"; } } diff --git a/tests/core/proc/asset/basicpipetest.cpp b/tests/core/proc/asset/basicpipetest.cpp index 47d12f5d6..b20910eed 100644 --- a/tests/core/proc/asset/basicpipetest.cpp +++ b/tests/core/proc/asset/basicpipetest.cpp @@ -33,12 +33,10 @@ #include "lib/query-util.hpp" #include "common/query.hpp" -#include using util::contains; using util::isnil; using std::string; -using std::cout; namespace proc { diff --git a/tests/core/proc/asset/deleteassettest.cpp b/tests/core/proc/asset/deleteassettest.cpp index c8b4bc50c..a03d30356 100644 --- a/tests/core/proc/asset/deleteassettest.cpp +++ b/tests/core/proc/asset/deleteassettest.cpp @@ -24,10 +24,8 @@ #include "lib/test/run.hpp" //#include "lib/util.hpp" -#include using std::string; -using std::cout; namespace proc { diff --git a/tests/core/proc/asset/entry-id-test.cpp b/tests/core/proc/asset/entry-id-test.cpp index 354849640..4f6180292 100644 --- a/tests/core/proc/asset/entry-id-test.cpp +++ b/tests/core/proc/asset/entry-id-test.cpp @@ -30,10 +30,10 @@ #include "proc/mobject/session/fork.hpp" #include "lib/meta/trait-special.hpp" #include "lib/util-foreach.hpp" +#include "lib/format-cout.hpp" #include "lib/symbol.hpp" #include -#include #include using lib::test::showSizeof; @@ -43,8 +43,6 @@ using util::contains; using util::and_all; using lib::Literal; using std::string; -using std::cout; -using std::endl; diff --git a/tests/core/proc/asset/meta/time-grid-basics-test.cpp b/tests/core/proc/asset/meta/time-grid-basics-test.cpp index aee4107ed..5d4d47beb 100644 --- a/tests/core/proc/asset/meta/time-grid-basics-test.cpp +++ b/tests/core/proc/asset/meta/time-grid-basics-test.cpp @@ -26,17 +26,14 @@ #include "proc/asset/meta.hpp" #include "proc/asset/meta/time-grid.hpp" -#include "proc/asset/asset-format.hpp" #include "lib/time/timevalue.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include -#include using boost::rational_cast; using lib::test::randStr; -using std::cout; -using std::endl; diff --git a/tests/core/proc/asset/testclipasset.hpp b/tests/core/proc/asset/testclipasset.hpp index 05e971160..4d0ca97c9 100644 --- a/tests/core/proc/asset/testclipasset.hpp +++ b/tests/core/proc/asset/testclipasset.hpp @@ -28,10 +28,8 @@ #include "lib/test/run.hpp" //#include "lib/util.hpp" -#include using std::string; -using std::cout; namespace proc { diff --git a/tests/core/proc/asset/typed-id-test.cpp b/tests/core/proc/asset/typed-id-test.cpp index 65e54cdc8..ae2c80977 100644 --- a/tests/core/proc/asset/typed-id-test.cpp +++ b/tests/core/proc/asset/typed-id-test.cpp @@ -33,10 +33,10 @@ //#include "proc/mobject/session/fork.hpp" //#include "lib/meta/trait-special.hpp" #include "lib/util-foreach.hpp" +#include "lib/format-cout.hpp" #include "lib/symbol.hpp" //#include -#include //#include //using lib::test::showSizeof; @@ -49,8 +49,6 @@ using util::isnil; using lib::Symbol; using lib::P; //using std::string; -using std::cout; -using std::endl; diff --git a/tests/core/proc/control/argument-tuple-accept-test.cpp b/tests/core/proc/control/argument-tuple-accept-test.cpp index fdf3e9a41..ac59a8b9e 100644 --- a/tests/core/proc/control/argument-tuple-accept-test.cpp +++ b/tests/core/proc/control/argument-tuple-accept-test.cpp @@ -26,13 +26,9 @@ #include "proc/control/argument-tuple-accept.hpp" #include "lib/meta/function.hpp" #include "lib/meta/tuple.hpp" -#include "lib/time/diagnostics.hpp" +#include "lib/format-cout.hpp" #include -#include - -using std::cout; -using std::endl; namespace proc { diff --git a/tests/core/proc/control/command-argument-test.cpp b/tests/core/proc/control/command-argument-test.cpp index ac043f5e9..2921ac417 100644 --- a/tests/core/proc/control/command-argument-test.cpp +++ b/tests/core/proc/control/command-argument-test.cpp @@ -25,14 +25,13 @@ #include "lib/test/test-helper.hpp" #include "proc/control/command-argument-holder.hpp" #include "lib/scoped-ptrvect.hpp" -#include "lib/time/diagnostics.hpp" #include "lib/meta/tuple.hpp" #include "lib/format-string.hpp" +#include "lib/format-cout.hpp" #include "lib/util-foreach.hpp" #include "lib/util.hpp" #include -#include #include #include #include @@ -44,11 +43,8 @@ using lib::time::Time; using lib::time::TimeVar; using lib::time::TimeValue; using std::string; -using std::ostream; using std::ostringstream; using std::rand; -using std::cout; -using std::endl; namespace proc { @@ -90,11 +86,6 @@ namespace test { operator string() const { return element_; } - friend ostream& - operator<< (ostream& out, const Tracker& tra) - { - return out << tra.element_; - } friend bool operator== (Tracker const& tra1, Tracker const& tra2) diff --git a/tests/core/proc/control/command-binding-test.cpp b/tests/core/proc/control/command-binding-test.cpp index e20b61747..549137d2a 100644 --- a/tests/core/proc/control/command-binding-test.cpp +++ b/tests/core/proc/control/command-binding-test.cpp @@ -23,19 +23,14 @@ #include "lib/test/run.hpp" #include "proc/control/command-def.hpp" - #include "proc/control/test-dummy-commands.hpp" - -#include +#include "lib/format-cout.hpp" namespace proc { namespace control { namespace test { - using std::cout; - using std::endl; - @@ -93,7 +88,7 @@ namespace test { ; Command com ("test.command3.2"); CHECK (com.canExec()); - cout << string(com) << endl; + cout << com << endl; com(); CHECK ( 2 == command3::check_); diff --git a/tests/core/proc/control/command-equality-test.cpp b/tests/core/proc/control/command-equality-test.cpp index aaabbbbcc..d4d7cecb3 100644 --- a/tests/core/proc/control/command-equality-test.cpp +++ b/tests/core/proc/control/command-equality-test.cpp @@ -28,12 +28,12 @@ #include "proc/control/argument-erasure.hpp" #include "proc/control/command-argument-holder.hpp" #include "proc/control/memento-tie.hpp" +#include "lib/format-cout.hpp" #include "lib/meta/tuple.hpp" #include "lib/symbol.hpp" #include "lib/util.hpp" #include -#include #include namespace proc { @@ -50,8 +50,6 @@ namespace test { using std::function; using std::bind; using std::string; - using std::cout; - using std::endl; diff --git a/tests/core/proc/control/command-mutation-test.cpp b/tests/core/proc/control/command-mutation-test.cpp index 8fe501260..d5746c74e 100644 --- a/tests/core/proc/control/command-mutation-test.cpp +++ b/tests/core/proc/control/command-mutation-test.cpp @@ -28,17 +28,15 @@ #include "proc/control/memento-tie.hpp" #include "lib/meta/typelist.hpp" #include "lib/meta/tuple.hpp" +#include "lib/format-cout.hpp" #include -#include #include #include using std::function; using std::string; using std::rand; -using std::cout; -using std::endl; namespace proc { diff --git a/tests/core/proc/control/command-use1-test.cpp b/tests/core/proc/control/command-use1-test.cpp index 7e6d5b42f..ca1816e63 100644 --- a/tests/core/proc/control/command-use1-test.cpp +++ b/tests/core/proc/control/command-use1-test.cpp @@ -26,12 +26,11 @@ #include "proc/control/command-invocation.hpp" #include "proc/control/command-def.hpp" #include "lib/format-util.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include "proc/control/test-dummy-commands.hpp" -#include - namespace proc { namespace control { @@ -40,8 +39,6 @@ namespace test { using util::isSameObject; using util::contains; using util::str; - using std::cout; - using std::endl; @@ -121,8 +118,8 @@ namespace test { Command com ("test.command1.2"); CHECK (com); CHECK (com == Command::get("test.command1.2")); - CHECK (contains (str(com), "test.command1.2")); - CHECK (contains (str(com), "{def}")); //////////////////TICKET #985 : make str obsolete! + CHECK (contains (string(com), "test.command1.2")); + CHECK (contains (string(com), "{def}")); CHECK (!com.canExec()); VERIFY_ERROR (UNBOUND_ARGUMENTS, com() ); CHECK ( 0 == command1::check_); @@ -307,11 +304,11 @@ namespace test { void stringRepresentation() { - cout << string (Command::get("test.command1.1")) << endl; - cout << string (Command::get("test.command1.2")) << endl; - cout << string (Command::get("test.command1.3")) << endl; - cout << string (Command::get("test.command1.4")) << endl; - cout << string (Command() ) << endl; + cout << Command::get("test.command1.1") << endl; + cout << Command::get("test.command1.2") << endl; + cout << Command::get("test.command1.3") << endl; + cout << Command::get("test.command1.4") << endl; + cout << Command() << endl; Command com = CommandDef ("test.command1.5") @@ -319,13 +316,13 @@ namespace test { .captureUndo (command1::capture) .undoOperation (command1::undoIt); - cout << string (com) << endl; + cout << com << endl; com.bind(123); - cout << string (com) << endl; + cout << com << endl; com(); - cout << string (com) << endl; + cout << com << endl; com.undo(); - cout << string (com) << endl; + cout << com << endl; } diff --git a/tests/core/proc/control/command-use3-test.cpp b/tests/core/proc/control/command-use3-test.cpp index 3819684db..32c6ffe9b 100644 --- a/tests/core/proc/control/command-use3-test.cpp +++ b/tests/core/proc/control/command-use3-test.cpp @@ -24,14 +24,13 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "proc/control/command-def.hpp" -#include "lib/util.hpp" +//#include "lib/format-cout.hpp" +//#include "lib/util.hpp" #include "proc/control/test-dummy-commands.hpp" //#include //#include -//#include -//#include //#include //#include @@ -41,15 +40,11 @@ namespace control { namespace test { -// using boost::format; -// using boost::str; //using util::contains; // using std::function; // using std::bind; // using std::string; //using std::rand; - //using std::cout; - //using std::endl; // using lib::test::showSizeof; // using util::isSameObject; // using util::contains; diff --git a/tests/core/proc/control/handling-pattern-standard-impl-test.cpp b/tests/core/proc/control/handling-pattern-standard-impl-test.cpp index 539cfc137..f427fa447 100644 --- a/tests/core/proc/control/handling-pattern-standard-impl-test.cpp +++ b/tests/core/proc/control/handling-pattern-standard-impl-test.cpp @@ -36,6 +36,7 @@ #include "proc/control/command-impl.hpp" #include "proc/control/command-registry.hpp" //#include "proc/control/command-def.hpp" +//#include "lib/format-cout.hpp" //#include "lib/symbol.hpp" //#include "lib/util.hpp" @@ -43,8 +44,6 @@ //#include //#include -//#include -//#include //#include //#include @@ -54,15 +53,11 @@ namespace control { namespace test { -// using boost::format; -// using boost::str; //using util::contains; using std::function; // using std::bind; // using std::string; //using std::rand; - //using std::cout; - //using std::endl; // using lib::test::showSizeof; // using util::isSameObject; // using util::contains; diff --git a/tests/core/proc/engine/buff-table-test.cpp b/tests/core/proc/engine/buff-table-test.cpp index 53a534fdb..859a027fe 100644 --- a/tests/core/proc/engine/buff-table-test.cpp +++ b/tests/core/proc/engine/buff-table-test.cpp @@ -27,13 +27,11 @@ #include "proc/engine/procnode.hpp" #include "proc/engine/bufftable-obsolete.hpp" #include "lib/ref-array.hpp" +#include "lib/format-cout.hpp" #include -#include using test::Test; -using std::cout; -using std::rand; namespace proc { diff --git a/tests/core/proc/engine/calc-stream-test.cpp b/tests/core/proc/engine/calc-stream-test.cpp index 7b4272d6a..6993b02e8 100644 --- a/tests/core/proc/engine/calc-stream-test.cpp +++ b/tests/core/proc/engine/calc-stream-test.cpp @@ -27,11 +27,9 @@ #include "proc/engine/engine-service.hpp" //#include -//#include //#include using test::Test; -//using std::cout; //using std::rand; diff --git a/tests/core/proc/engine/dispatcher-interface-test.cpp b/tests/core/proc/engine/dispatcher-interface-test.cpp index 13be756ad..e75603f7d 100644 --- a/tests/core/proc/engine/dispatcher-interface-test.cpp +++ b/tests/core/proc/engine/dispatcher-interface-test.cpp @@ -31,13 +31,13 @@ #include "proc/play/timings.hpp" #include "lib/time/timevalue.hpp" //#include "lib/time/timequant.hpp" +//#include "lib/format-cout.hpp" #include "lib/depend.hpp" #include "lib/itertools.hpp" #include "lib/util-coll.hpp" #include "lib/util.hpp" //#include -//#include #include #include @@ -46,7 +46,6 @@ using util::isnil; using util::last; using std::vector; using std::function; -//using std::cout; //using std::rand; diff --git a/tests/core/proc/engine/engine-interface-test.cpp b/tests/core/proc/engine/engine-interface-test.cpp index d4c138240..025475bb6 100644 --- a/tests/core/proc/engine/engine-interface-test.cpp +++ b/tests/core/proc/engine/engine-interface-test.cpp @@ -34,11 +34,9 @@ #include "lib/time/timevalue.hpp" //#include -//#include //#include using test::Test; -//using std::cout; //using std::rand; diff --git a/tests/core/proc/engine/node-basic-test.cpp b/tests/core/proc/engine/node-basic-test.cpp index 9bdb388e2..56a61a16a 100644 --- a/tests/core/proc/engine/node-basic-test.cpp +++ b/tests/core/proc/engine/node-basic-test.cpp @@ -22,20 +22,17 @@ #include "lib/test/run.hpp" -//#include "lib/util.hpp" #include "proc/engine/nodefactory.hpp" #include "proc/engine/nodewiring.hpp" #include "proc/engine/stateproxy.hpp" #include "proc/engine/channel-descriptor.hpp" #include "proc/mobject/session/effect.hpp" #include "lib/allocation-cluster.hpp" +//#include "lib/format-cout.hpp" +//#include "lib/util.hpp" -//#include -//#include -//using boost::format; //using std::string; -//using std::cout; namespace proc { diff --git a/tests/core/proc/engine/node-fabrication-test.cpp b/tests/core/proc/engine/node-fabrication-test.cpp index 15caeb7c5..a4fef5324 100644 --- a/tests/core/proc/engine/node-fabrication-test.cpp +++ b/tests/core/proc/engine/node-fabrication-test.cpp @@ -24,12 +24,8 @@ #include "lib/test/run.hpp" //#include "lib/util.hpp" -//#include -#include -//using boost::format; using std::string; -using std::cout; namespace proc { diff --git a/tests/core/proc/engine/node-operation-test.cpp b/tests/core/proc/engine/node-operation-test.cpp index 196671e5b..0e3a7e3f4 100644 --- a/tests/core/proc/engine/node-operation-test.cpp +++ b/tests/core/proc/engine/node-operation-test.cpp @@ -24,12 +24,8 @@ #include "lib/test/run.hpp" //#include "lib/util.hpp" -//#include -#include -//using boost::format; -using std::string; -using std::cout; +//using std::string; namespace proc { diff --git a/tests/core/proc/engine/node-source-test.cpp b/tests/core/proc/engine/node-source-test.cpp index af7dc179e..a722e052d 100644 --- a/tests/core/proc/engine/node-source-test.cpp +++ b/tests/core/proc/engine/node-source-test.cpp @@ -24,12 +24,8 @@ #include "lib/test/run.hpp" //#include "lib/util.hpp" -//#include -#include -//using boost::format; -using std::string; -using std::cout; +//using std::string; namespace proc { diff --git a/tests/core/proc/mobject/builder/buildertooltest.cpp b/tests/core/proc/mobject/builder/buildertooltest.cpp index b4938cb5b..8ac47cf24 100644 --- a/tests/core/proc/mobject/builder/buildertooltest.cpp +++ b/tests/core/proc/mobject/builder/buildertooltest.cpp @@ -31,10 +31,9 @@ #include "proc/mobject/test-dummy-mobject.hpp" #include "backend/media-access-mock.hpp" #include "lib/test/depend-4test.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include - using util::cStr; using std::string; using std::cout; @@ -73,7 +72,7 @@ namespace test { void treat (Clip& c) { Placement& pC = getPlacement(); - cout << "Clip on media : "<< str(pC->getMedia()) <<"\n"; //////////////////TICKET #985 : make str obsolete! + cout << "Clip on media : "<< pC->getMedia() <<"\n"; CHECK (pC->operator==(c)); log_ = string (pC); } diff --git a/tests/core/proc/mobject/builder/buildsegmenttest.cpp b/tests/core/proc/mobject/builder/buildsegmenttest.cpp index f72edd70e..95bd3b2c0 100644 --- a/tests/core/proc/mobject/builder/buildsegmenttest.cpp +++ b/tests/core/proc/mobject/builder/buildsegmenttest.cpp @@ -24,12 +24,8 @@ #include "lib/test/run.hpp" //#include "lib/util.hpp" -//#include -#include -//using boost::format; -using std::string; -using std::cout; +//using std::string; namespace proc { diff --git a/tests/core/proc/mobject/controller/rendersegmenttest.cpp b/tests/core/proc/mobject/controller/rendersegmenttest.cpp index 5aaa1b7b5..7b148c3e9 100644 --- a/tests/core/proc/mobject/controller/rendersegmenttest.cpp +++ b/tests/core/proc/mobject/controller/rendersegmenttest.cpp @@ -24,12 +24,7 @@ #include "lib/test/run.hpp" //#include "lib/util.hpp" -//#include -#include - -//using boost::format; -using std::string; -using std::cout; +//using std::string; namespace proc { diff --git a/tests/core/proc/mobject/mobject-interface-test.cpp b/tests/core/proc/mobject/mobject-interface-test.cpp index 3f6e47755..4a78cf813 100644 --- a/tests/core/proc/mobject/mobject-interface-test.cpp +++ b/tests/core/proc/mobject/mobject-interface-test.cpp @@ -38,8 +38,8 @@ #include "backend/media-access-mock.hpp" #include "lib/test/depend-4test.hpp" #include "lib/time/timevalue.hpp" +#include "lib/format-cout.hpp" -#include @@ -49,9 +49,6 @@ namespace mobject { namespace test { // using lib::test::showSizeof; - using std::string; - using std::cout; - using std::endl; using lib::Symbol; using lib::test::Depend4Test; diff --git a/tests/core/proc/mobject/mobject-ref-test.cpp b/tests/core/proc/mobject/mobject-ref-test.cpp index fc1eb9224..2b7469e9b 100644 --- a/tests/core/proc/mobject/mobject-ref-test.cpp +++ b/tests/core/proc/mobject/mobject-ref-test.cpp @@ -36,9 +36,9 @@ #include "lib/test/depend-4test.hpp" #include "lib/test/test-helper.hpp" #include "lib/time/timevalue.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include using lib::test::Depend4Test; using lib::test::showSizeof; @@ -47,8 +47,6 @@ using lib::time::FSecs; using lib::time::Time; using util::isnil; using std::string; -using std::cout; -using std::endl; namespace proc { @@ -188,18 +186,18 @@ namespace test { MORef rMO; CHECK (!rMO); // still empty (not bound) CHECK (0==rMO.use_count()); - cout << string(rMO) << endl; /////////////////////TICKET #527 + cout << rMO << endl; /////////////////////TICKET #527 cout << showSizeof(rMO) << endl; // activate by binding to provided ref rMO.activate(refObj); CHECK (rMO); // now bound - cout << string(rMO) << endl; /////////////////////TICKET #527 + cout << rMO << endl; /////////////////////TICKET #527 // access MObject (Clip API) // cout << rMO->operator string() << endl; /////////////////////TICKET #428 PMedia media = rMO->getMedia(); - cout << str(media) << endl; /////////////////////TICKET #520 ///////TICKET #985 : make str obsolete! + cout << media << endl; /////////////////////TICKET #520 Duration mediaLength = media->getLength(); CHECK (!isnil (mediaLength)); CHECK (rMO->isValid()); @@ -218,7 +216,7 @@ namespace test { CHECK (refP.use_count() == rMO.use_count()); CHECK (checkUseCount(refP, 1)); // use count not changed CHECK (&refP == placementAdr); // actually denotes the address of the original Placement in the "session" - cout << string(refP) << endl; + cout << refP << endl; ExplicitPlacement exPla = refP.resolve(); CHECK (exPla.time == start); // recovered Placement resolves to the same time as provided by the proxied API @@ -371,8 +369,8 @@ namespace test { CHECK (checkUseCount(rMObj, 2)); CHECK (checkUseCount(rClip, 2)); - cout << string(rClip) << endl; //////////TICKET #527 - cout << string(rClip->getMedia()->ident) << endl; //////////TICKET #520 + cout << rClip << endl; //////////TICKET #527 + cout << rClip->getMedia()->ident << endl; //////////TICKET #520 } }; diff --git a/tests/core/proc/mobject/placement-basic-test.cpp b/tests/core/proc/mobject/placement-basic-test.cpp index 2d9f2ac2a..b4edf1c0a 100644 --- a/tests/core/proc/mobject/placement-basic-test.cpp +++ b/tests/core/proc/mobject/placement-basic-test.cpp @@ -29,14 +29,10 @@ #include "proc/mobject/explicitplacement.hpp" #include "proc/mobject/session/mobjectfactory.hpp" ////TODO: avoidable? #include "lib/time/timevalue.hpp" -#include "lib/util.hpp" +//#include "lib/util.hpp" -#include using lib::time::Time; -using util::contains; -using std::string; -using std::cout; namespace proc { diff --git a/tests/core/proc/mobject/placement-hierarchy-test.cpp b/tests/core/proc/mobject/placement-hierarchy-test.cpp index 0039e56e6..a2f667267 100644 --- a/tests/core/proc/mobject/placement-hierarchy-test.cpp +++ b/tests/core/proc/mobject/placement-hierarchy-test.cpp @@ -29,20 +29,14 @@ #include "proc/mobject/session/clip.hpp" #include "proc/mobject/placement.hpp" #include "proc/asset/media.hpp" +#include "lib/format-cout.hpp" #include "lib/error.hpp" #include "lib/util.hpp" -#include -#include using lib::HashIndexed; using lib::test::Depend4Test; -using std::shared_ptr; -using std::string; -using std::cout; -using std::endl; - namespace proc { namespace mobject { @@ -114,14 +108,11 @@ namespace test { CHECK (sizeof(pSub1) == sizeof(pSub3)); CHECK (sizeof(pClip) == sizeof(pSub3)); - cout << string(pSub1) << endl; - cout << string(pSub2) << endl; - cout << string(pSub3) << endl; - cout << string(pSubM) << endl; - cout << string(pClip) << endl; - cout << pSub1->operator string() << endl; - cout << pSub2->operator string() << endl; - cout << pSubM->operator string() << endl; + cout << pSub1 << endl; + cout << pSub2 << endl; + cout << pSub3 << endl; + cout << pSubM << endl; + cout << pClip << endl; pSub3->specialAPI(); diff --git a/tests/core/proc/mobject/placement-object-identity-test.cpp b/tests/core/proc/mobject/placement-object-identity-test.cpp index a0c8a1252..1de776ff6 100644 --- a/tests/core/proc/mobject/placement-object-identity-test.cpp +++ b/tests/core/proc/mobject/placement-object-identity-test.cpp @@ -35,11 +35,6 @@ //#include "proc/mobject/test-dummy-mobject.hpp" //#include "lib/test/test-helper.hpp" -//#include -// -//using std::string; -//using std::cout; -//using std::endl; namespace proc { diff --git a/tests/core/proc/mobject/placement-ref-test.cpp b/tests/core/proc/mobject/placement-ref-test.cpp index 37f40cf6f..b3c984ff7 100644 --- a/tests/core/proc/mobject/placement-ref-test.cpp +++ b/tests/core/proc/mobject/placement-ref-test.cpp @@ -30,14 +30,11 @@ #include "proc/mobject/explicitplacement.hpp" #include "proc/mobject/test-dummy-mobject.hpp" #include "lib/time/timevalue.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include using util::isSameObject; -using std::string; -using std::cout; -using std::endl; namespace proc { @@ -108,9 +105,9 @@ namespace test { CHECK (isSameObject (p2, *ref2)); CHECK (isSameObject (p2, *refX)); - cout << string(*ref1) << endl; - cout << string(*ref2) << endl; - cout << string(*refX) << endl; + cout << *ref1 << endl; + cout << *ref2 << endl; + cout << *refX << endl; // PlacementRef mimics placement behaviour ref1->specialAPI(); diff --git a/tests/core/proc/mobject/session/addcliptest.cpp b/tests/core/proc/mobject/session/addcliptest.cpp index b2f823fc6..0f05faac2 100644 --- a/tests/core/proc/mobject/session/addcliptest.cpp +++ b/tests/core/proc/mobject/session/addcliptest.cpp @@ -25,15 +25,12 @@ #include "proc/mobject/session.hpp" #include "proc/mobject/session/testclip.hpp" #include "proc/mobject/placement.hpp" +//#include "lib/format-cout.hpp" #include "lib/util.hpp" -//#include -#include -//using boost::format; using util::contains; -using std::string; -using std::cout; +//using std::string; namespace proc { diff --git a/tests/core/proc/mobject/session/deletecliptest.cpp b/tests/core/proc/mobject/session/deletecliptest.cpp index cbf0d3736..63600cdac 100644 --- a/tests/core/proc/mobject/session/deletecliptest.cpp +++ b/tests/core/proc/mobject/session/deletecliptest.cpp @@ -26,14 +26,11 @@ #include "proc/mobject/session.hpp" #include "proc/mobject/session/testsession1.hpp" #include "proc/mobject/session/clip.hpp" // TODO: really neded? +#include "lib/format-cout.hpp" //#include "lib/util.hpp" -//#include -#include -//using boost::format; -using std::string; -using std::cout; +//using std::string; using proc_interface::AssetManager; using proc_interface::PAsset; diff --git a/tests/core/proc/mobject/session/placement-index-query-test.cpp b/tests/core/proc/mobject/session/placement-index-query-test.cpp index dfb8d44bd..c0d451224 100644 --- a/tests/core/proc/mobject/session/placement-index-query-test.cpp +++ b/tests/core/proc/mobject/session/placement-index-query-test.cpp @@ -27,11 +27,9 @@ #include "proc/mobject/session/placement-index-query-resolver.hpp" #include "proc/mobject/session/test-scopes.hpp" #include "common/query/query-resolver.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include -#include - namespace proc { @@ -43,9 +41,6 @@ namespace test { using session::PathQuery; using session::ContentsQuery; using util::isSameObject; - using std::string; - using std::cout; - using std::endl; /************************************************************************//** @@ -103,7 +98,7 @@ namespace test { PlacementMO& elm = *ContentsQuery(root).resolveBy(resolver); ////////////////////// TICKET #532 - cout << "path to root starting at " << string(elm) << endl; + cout << "path to root starting at " << elm << endl; discover (PathQuery (elm).resolveBy(resolver)); } @@ -113,7 +108,7 @@ namespace test { discover (IT result) { for ( ; result; ++result) - cout << string(*result) << endl; + cout << *result << endl; } }; diff --git a/tests/core/proc/mobject/session/placement-index-test.cpp b/tests/core/proc/mobject/session/placement-index-test.cpp index 216ff8dc7..5579d9719 100644 --- a/tests/core/proc/mobject/session/placement-index-test.cpp +++ b/tests/core/proc/mobject/session/placement-index-test.cpp @@ -27,19 +27,17 @@ #include "proc/mobject/session/scope.hpp" #include "proc/mobject/placement.hpp" #include "proc/asset/media.hpp" +#include "lib/format-string.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include "proc/mobject/session/testclip.hpp" #include "proc/mobject/session/testroot.hpp" -#include -#include -using boost::format; +using util::_Fmt; using util::isSameObject; using std::string; -using std::cout; -using std::endl; namespace proc { @@ -296,7 +294,7 @@ namespace test { uint count (0); for ( ; iter; ++iter ) { - cout << indent(level) << "::" << string(*iter) << endl; + cout << indent(level) << "::" << *iter << endl; ++count; Iter scopeContents = index.getReferrers (iter->getID()); @@ -304,7 +302,7 @@ namespace test { discover (index, scopeContents, level+1); } - static format summary ("...%i elements at Level %i"); + static _Fmt summary{"...%i elements at Level %i"}; cout << indent(level) << summary % count % level << endl; CHECK (!iter); diff --git a/tests/core/proc/mobject/session/placement-scope-test.cpp b/tests/core/proc/mobject/session/placement-scope-test.cpp index 068d01eff..2d8e7e8ee 100644 --- a/tests/core/proc/mobject/session/placement-scope-test.cpp +++ b/tests/core/proc/mobject/session/placement-scope-test.cpp @@ -27,9 +27,9 @@ #include "proc/mobject/session/scope.hpp" #include "proc/mobject/session/test-scopes.hpp" #include "proc/mobject/session/scope-locator.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include using util::isSameObject; @@ -102,8 +102,8 @@ namespace test { PlacementMO& elm = *ii; CHECK (elm.isValid()); Scope const& scope1 = Scope::containing(elm); - std::cout << "Scope: " << string(scope1) << std::endl; - std::cout << string(elm) << std::endl; + cout << "Scope: " << scope1 << endl; + cout << elm << endl; RefPlacement ref (elm); Scope const& scope2 = Scope::containing(ref); diff --git a/tests/core/proc/mobject/session/query-focus-test.cpp b/tests/core/proc/mobject/session/query-focus-test.cpp index 1fac93072..129ed0388 100644 --- a/tests/core/proc/mobject/session/query-focus-test.cpp +++ b/tests/core/proc/mobject/session/query-focus-test.cpp @@ -26,9 +26,7 @@ #include "proc/mobject/session/placement-index.hpp" #include "proc/mobject/session/query-focus.hpp" #include "proc/mobject/session/scope.hpp" - -#include -#include +#include "lib/format-cout.hpp" @@ -50,10 +48,6 @@ namespace test { - using std::string; - using std::cout; - using std::endl; - /*******************************************************************************//** * @test handling of current query focus when navigating a system of nested scopes. @@ -138,7 +132,7 @@ namespace test { CHECK (num_refs > 1); // because the run() function also holds a ref QueryFocus subF = QueryFocus::push(); - cout << string(subF) << endl; + cout << subF << endl; CHECK (subF == original); CHECK ( 1 == refs(subF) ); @@ -148,25 +142,25 @@ namespace test { QueryFocus subF2 = QueryFocus::push(Scope(subF).getParent()); CHECK (subF2 != subF); CHECK (subF == original); - cout << string(subF2) << endl; + cout << subF2 << endl; ScopeQuery::iterator ii = subF2.explore(); while (ii) // drill down depth first { subF2.shift(*ii); - cout << string(subF2) << endl; + cout << subF2 << endl; ii = subF2.explore(); } - cout << string(subF2) << "<<<--discovery exhausted" << endl; + cout << subF2 << "<<<--discovery exhausted" << endl; subF2.pop(); // releasing this focus and re-attaching to what's on stack top - cout << string(subF2) << "<<<--after pop()" << endl; + cout << subF2 << "<<<--after pop()" << endl; CHECK (subF2 == subF); CHECK (2 == refs(subF2)); // both are now attached to the same path CHECK (2 == refs(subF)); } // subF2 went out of scope, but no auto-pop happens (because subF is still there) - cout << string(subF) << endl; + cout << subF << endl; CHECK ( 1 == refs(subF)); CHECK (num_refs == refs(original)); diff --git a/tests/core/proc/mobject/session/query-resolver-test.cpp b/tests/core/proc/mobject/session/query-resolver-test.cpp index c6db78ddf..b23ddb513 100644 --- a/tests/core/proc/mobject/session/query-resolver-test.cpp +++ b/tests/core/proc/mobject/session/query-resolver-test.cpp @@ -23,11 +23,11 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" +#include "lib/format-cout.hpp" #include "lib/depend.hpp" #include "common/query/query-resolver.hpp" -#include #include @@ -37,8 +37,6 @@ namespace test{ using lib::test::showSizeof; using std::string; - using std::cout; - using std::endl; diff --git a/tests/core/proc/mobject/session/rebuildfixturetest.cpp b/tests/core/proc/mobject/session/rebuildfixturetest.cpp index 75acf46af..72053aa82 100644 --- a/tests/core/proc/mobject/session/rebuildfixturetest.cpp +++ b/tests/core/proc/mobject/session/rebuildfixturetest.cpp @@ -24,17 +24,10 @@ #include "lib/test/run.hpp" #include "proc/mobject/session.hpp" #include "proc/mobject/session/testsession1.hpp" -#include "lib/util-foreach.hpp" -#include "lib/util.hpp" +//#include "lib/format-cout.hpp" +//#include "lib/util.hpp" -#include -#include - -using std::bind; -using util::contains; -using util::for_each; -using std::string; -using std::cout; +//using util::contains; namespace proc { diff --git a/tests/core/proc/mobject/session/scope-path-test.cpp b/tests/core/proc/mobject/session/scope-path-test.cpp index 8c84878db..87957790a 100644 --- a/tests/core/proc/mobject/session/scope-path-test.cpp +++ b/tests/core/proc/mobject/session/scope-path-test.cpp @@ -27,9 +27,9 @@ #include "proc/mobject/session/placement-index.hpp" #include "proc/mobject/session/scope-path.hpp" #include "proc/mobject/session/test-scope-invalid.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include #include @@ -38,8 +38,6 @@ namespace mobject { namespace session { namespace test { - using std::cout; - using std::endl; using std::string; using util::isnil; using util::isSameObject; @@ -312,7 +310,7 @@ namespace test { void navigate (const ScopePath refPath, PPIdx index) { - #define __SHOWPATH(N) cout << "Step("< #include @@ -40,12 +40,9 @@ namespace mobject { namespace session { namespace test { + using util::contains; using lib::Literal; using std::string; - using std::cout; - using std::endl; - - using util::contains; namespace { // helpers and shortcuts.... @@ -65,7 +62,7 @@ namespace test { { for (IT elm(iter); elm; ++elm) - cout << string(*elm) << endl; + cout << *elm << endl; } void diff --git a/tests/core/proc/mobject/session/session-modify-parts-test.cpp b/tests/core/proc/mobject/session/session-modify-parts-test.cpp index 658efce52..14c9cad8b 100644 --- a/tests/core/proc/mobject/session/session-modify-parts-test.cpp +++ b/tests/core/proc/mobject/session/session-modify-parts-test.cpp @@ -27,6 +27,7 @@ //#include "proc/assetmanager.hpp" //////?? //#include "proc/asset/timeline.hpp" #include "proc/asset/sequence.hpp" +#include "lib/format-cout.hpp" #include "lib/util-foreach.hpp" #include "proc/mobject/session/testclip.hpp" #include "proc/mobject/mobject-ref.hpp" @@ -34,15 +35,12 @@ #include "common/query.hpp" #include -#include #include using std::ref; using std::placeholders::_1; using util::isSameObject; using util::and_all; -using std::string; -using std::cout; using std::set; diff --git a/tests/core/proc/mobject/session/session-service-access-test.cpp b/tests/core/proc/mobject/session/session-service-access-test.cpp index bd6925202..941b83e8c 100644 --- a/tests/core/proc/mobject/session/session-service-access-test.cpp +++ b/tests/core/proc/mobject/session/session-service-access-test.cpp @@ -24,9 +24,10 @@ #include "lib/test/run.hpp" #include "proc/mobject/session.hpp" #include "lib/meta/generator.hpp" +#include "lib/format-cout.hpp" #include "lib/depend.hpp" + #include -#include #include @@ -37,10 +38,7 @@ namespace test { using lib::Depend; using boost::lexical_cast; - using std::ostream; using std::string; - using std::cout; - using std::endl; namespace { // what follows is a simulated (simplified) version @@ -235,12 +233,6 @@ namespace test { /* === Implementation of Session internals === */ //----------------corresponding-to-session-impl.cpp - inline ostream& - operator<< (ostream& os, TSessionImpl const& simpl) - { - return os << string(simpl); - } - TSessionImpl::operator string() const { return string("Session-Impl(") @@ -257,14 +249,14 @@ namespace test { void TSessionImpl::externalOperation() { - cout << *this << "::externalOperation()" << endl; + cout << this << "::externalOperation()" << endl; } /* ==== Implementation level API ==== */ inline void TSessionImpl::implementationService() { - cout << *this << "::implementationService()" << endl; + cout << this << "::implementationService()" << endl; } diff --git a/tests/core/proc/mobject/session/session-structure-test.cpp b/tests/core/proc/mobject/session/session-structure-test.cpp index dcdcb915e..37d741bbb 100644 --- a/tests/core/proc/mobject/session/session-structure-test.cpp +++ b/tests/core/proc/mobject/session/session-structure-test.cpp @@ -27,13 +27,10 @@ #include "proc/assetmanager.hpp" //////?? #include "proc/asset/timeline.hpp" #include "proc/asset/sequence.hpp" +//#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include - using util::isSameObject; -using std::string; -using std::cout; namespace proc { diff --git a/tests/core/proc/mobject/session/sessionmanagertest.cpp b/tests/core/proc/mobject/session/sessionmanagertest.cpp index fff7544be..8468e84b1 100644 --- a/tests/core/proc/mobject/session/sessionmanagertest.cpp +++ b/tests/core/proc/mobject/session/sessionmanagertest.cpp @@ -25,12 +25,8 @@ #include "proc/mobject/session.hpp" #include "proc/mobject/session/testsession1.hpp" //#include "lib/util.hpp" -//#include -#include -//using boost::format; -using std::string; -using std::cout; +//using std::string; namespace proc { diff --git a/tests/core/proc/mobject/session/testsession1.hpp b/tests/core/proc/mobject/session/testsession1.hpp index 0aec5e90c..10490d14c 100644 --- a/tests/core/proc/mobject/session/testsession1.hpp +++ b/tests/core/proc/mobject/session/testsession1.hpp @@ -29,12 +29,9 @@ #include "lib/error.hpp" //#include "lib/util.hpp" -//#include -#include +//#include -//using boost::format; -using std::string; -using std::cout; +//using std::string; namespace proc { diff --git a/tests/core/proc/mobject/session/timeline-sequence-handling-test.cpp b/tests/core/proc/mobject/session/timeline-sequence-handling-test.cpp index c19b05d38..044c675c4 100644 --- a/tests/core/proc/mobject/session/timeline-sequence-handling-test.cpp +++ b/tests/core/proc/mobject/session/timeline-sequence-handling-test.cpp @@ -33,12 +33,9 @@ #include "common/query.hpp" #include "lib/util.hpp" -#include using util::isSameObject; using util::contains; -using std::string; -using std::cout; namespace proc { diff --git a/tests/gui/abstract-tangible-test.cpp b/tests/gui/abstract-tangible-test.cpp index 9a84ca328..fd77c778f 100644 --- a/tests/gui/abstract-tangible-test.cpp +++ b/tests/gui/abstract-tangible-test.cpp @@ -51,17 +51,15 @@ #include "test/mock-elm.hpp" #include "test/test-nexus.hpp" #include "lib/idi/entry-id.hpp" +#include "lib/format-cout.hpp" #include "lib/error.hpp" //#include "lib/util.hpp" -#include using gui::test::MockElm; using lib::test::EventLog; using lib::idi::EntryID; -using std::cout; -using std::endl; diff --git a/tests/gui/bus-term-test.cpp b/tests/gui/bus-term-test.cpp index 664530cf1..98e2b69a4 100644 --- a/tests/gui/bus-term-test.cpp +++ b/tests/gui/bus-term-test.cpp @@ -26,18 +26,16 @@ #include "test/mock-elm.hpp" #include "lib/idi/entry-id.hpp" #include "lib/diff/gen-node.hpp" +#include "lib/format-cout.hpp" //#include "lib/util.hpp" -#include using lib::idi::EntryID; using lib::idi::BareEntryID; using gui::test::MockElm; using lib::diff::GenNode; //using util::contains; -using std::cout; -using std::endl; namespace gui { diff --git a/tests/gui/session-structure-mapping-test.cpp b/tests/gui/session-structure-mapping-test.cpp index 3b5755458..2d6588b2b 100644 --- a/tests/gui/session-structure-mapping-test.cpp +++ b/tests/gui/session-structure-mapping-test.cpp @@ -43,16 +43,10 @@ //#include "lib/util.hpp" -//#include -//#include //#include -//#include -//using boost::lexical_cast; //using util::contains; //using std::string; -//using std::cout; -//using std::endl; namespace gui { diff --git a/tests/gui/tangible-update-test.cpp b/tests/gui/tangible-update-test.cpp index 45dc348c6..d680fa3cb 100644 --- a/tests/gui/tangible-update-test.cpp +++ b/tests/gui/tangible-update-test.cpp @@ -42,16 +42,10 @@ //#include "lib/util.hpp" -//#include -//#include //#include -//#include -//using boost::lexical_cast; //using util::contains; //using std::string; -//using std::cout; -//using std::endl; namespace gui { diff --git a/tests/gui/test-gui-test.cpp b/tests/gui/test-gui-test.cpp index 7a932e8eb..a022c7858 100644 --- a/tests/gui/test-gui-test.cpp +++ b/tests/gui/test-gui-test.cpp @@ -24,10 +24,7 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" #include "gui/model/session-facade.hpp" - -#include - -using std::cout; +#include "lib/format-cout.hpp" namespace gui { diff --git a/tests/gui/test/mock-elm.hpp b/tests/gui/test/mock-elm.hpp index 028c42eac..775aec9d3 100644 --- a/tests/gui/test/mock-elm.hpp +++ b/tests/gui/test/mock-elm.hpp @@ -66,9 +66,9 @@ #include "lib/diff/record.hpp" #include "lib/idi/genfunc.hpp" #include "test/test-nexus.hpp" +#include "lib/format-cout.hpp" #include "lib/symbol.hpp" -#include #include @@ -83,9 +83,6 @@ namespace test{ using lib::Symbol; using std::string; - using std::cout; - using std::cerr; - using std::endl; /** @@ -171,7 +168,7 @@ namespace test{ doMark (GenNode const& mark) override { log_.call (this->identify(), "doMark", mark); - cout << this->identify() << " <-- state-mark = "<< string(mark) <identify() << " <-- state-mark = "<< mark < #include -using std::cerr; -using std::endl; using std::string; using lib::Variant; @@ -269,7 +267,7 @@ namespace test{ { log().call(this, "act", command); log().error ("sent command invocation to ZombieNexus"); - cerr << "Command " << string(command) << " -> ZombieNexus" < ZombieNexus" < ZombieNexus" < ZombieNexus" < ZombieNexus" < ZombieNexus" < ZombieNexus" < - using lib::time::Time; -using std::cout; -using std::endl; diff --git a/tests/library/advice/advice-configuration-test.cpp b/tests/library/advice/advice-configuration-test.cpp index e682334b9..68a6ff697 100644 --- a/tests/library/advice/advice-configuration-test.cpp +++ b/tests/library/advice/advice-configuration-test.cpp @@ -34,7 +34,6 @@ //#include "lib/util-foreach.hpp" //#include "lib/symbol.hpp" -//#include //#include //using lib::test::showSizeof; @@ -47,8 +46,6 @@ //using lib::Symbol; //using lib::P; //using std::string; -//using std::cout; -//using std::endl; diff --git a/tests/library/advice/advice-multiplicity-test.cpp b/tests/library/advice/advice-multiplicity-test.cpp index 00aa5e03b..f0641cdb4 100644 --- a/tests/library/advice/advice-multiplicity-test.cpp +++ b/tests/library/advice/advice-multiplicity-test.cpp @@ -34,7 +34,6 @@ //#include "lib/symbol.hpp" #include "common/advice.hpp" -//#include //#include //using lib::test::showSizeof; @@ -47,8 +46,6 @@ //using lib::Symbol; //using lib::P; //using std::string; -//using std::cout; -//using std::endl; diff --git a/tests/library/advice/advice-situations-test.cpp b/tests/library/advice/advice-situations-test.cpp index a966f2ca0..292df259a 100644 --- a/tests/library/advice/advice-situations-test.cpp +++ b/tests/library/advice/advice-situations-test.cpp @@ -35,7 +35,6 @@ //#include "lib/util-foreach.hpp" //#include "lib/symbol.hpp" -//#include //#include //using lib::test::showSizeof; @@ -48,8 +47,6 @@ //using lib::Symbol; //using liab::P; //using std::string; -//using std::cout; -//using std::endl; diff --git a/tests/library/cmdline-wrapper-test.cpp b/tests/library/cmdline-wrapper-test.cpp index 127b4c7a3..0bbecf71d 100644 --- a/tests/library/cmdline-wrapper-test.cpp +++ b/tests/library/cmdline-wrapper-test.cpp @@ -24,15 +24,13 @@ #include "lib/test/run.hpp" #include "lib/cmdline.hpp" #include "lib/util-foreach.hpp" +#include "lib/format-cout.hpp" -#include #include #include using util::for_each; using std::string; -using std::cout; -using std::endl; diff --git a/tests/library/diff/gen-node-basic-test.cpp b/tests/library/diff/gen-node-basic-test.cpp index 1b5f6babe..a84c2a81a 100644 --- a/tests/library/diff/gen-node-basic-test.cpp +++ b/tests/library/diff/gen-node-basic-test.cpp @@ -23,17 +23,14 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "lib/format-util.hpp" +#include "lib/format-cout.hpp" #include "lib/diff/gen-node.hpp" #include "lib/diff/record.hpp" #include "lib/time/timevalue.hpp" #include "lib/util-quant.hpp" #include "lib/util.hpp" -//#include -//#include -//#include -#include +#include using util::isnil; using util::contains; @@ -44,18 +41,13 @@ using lib::time::FSecs; using lib::time::Time; using lib::time::TimeSpan; using lib::test::randTime; -//using std::string; -//using std::vector; -//using std::swap; -using std::cout; -using std::endl; +using std::string; namespace lib { namespace diff{ namespace test{ -// using lumiera::error::LUMIERA_ERROR_LOGIC; using error::LUMIERA_ERROR_WRONG_TYPE; using error::LUMIERA_ERROR_BOTTOM_VALUE; @@ -149,7 +141,7 @@ namespace test{ CHECK (n3.data.get().get("ham").isNamed()); CHECK (!n3.isNamed()); - cout << string(n3) < #include #include @@ -37,8 +37,6 @@ using util::isnil; using util::join; using std::vector; using std::swap; -using std::cout; -using std::endl; namespace lib { @@ -164,12 +162,12 @@ namespace test{ VERIFY_ERROR (INVALID, enterprise.get("warp10")); cout << "enterprise = " - << string(enterprise)<" << join (enterprise.keys(), "<->")<" << join (enterprise.vals(), "<->")<" << join (enterprise.scope()," | ")< #include //#include -#include using util::isnil; using std::string; //using std::vector; //using std::swap; -using std::cout; -using std::endl; using lib::test::showType; using lib::meta::demangleCxx; diff --git a/tests/library/hash-standard-to-boost-bridge-test.cpp b/tests/library/hash-standard-to-boost-bridge-test.cpp index 2e69729bf..ff1cf2a08 100644 --- a/tests/library/hash-standard-to-boost-bridge-test.cpp +++ b/tests/library/hash-standard-to-boost-bridge-test.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include @@ -36,8 +35,6 @@ using util::contains; using std::unordered_set; using std::vector; using std::string; -using std::cout; -using std::endl; namespace lib { diff --git a/tests/library/helloworldtest.cpp b/tests/library/helloworldtest.cpp index 753881b80..e61e948c4 100644 --- a/tests/library/helloworldtest.cpp +++ b/tests/library/helloworldtest.cpp @@ -29,6 +29,8 @@ using boost::lexical_cast; using util::isnil; +using std::cout; +using std::endl; namespace lumiera{ @@ -42,17 +44,18 @@ namespace test { { virtual void run (Arg arg) - { - int num= isnil(arg)? 1 : lexical_cast (arg[1]); - - for ( ; 0 < num-- ; ) - greeting(); - } + { + int num= isnil(arg)? 1 : lexical_cast (arg[1]); + + for ( ; 0 < num-- ; ) + greeting(); + } - void greeting() - { - std::cout << "This is how the world ends...\n"; - } + void + greeting() + { + cout << "This is how the world ends..." < //#include //#include -#include //using std::string; //using std::vector; -using std::cout; -using std::endl; //using std::swap; diff --git a/tests/library/iter-adapter-stl-test.cpp b/tests/library/iter-adapter-stl-test.cpp index 7169b350b..980e72d1a 100644 --- a/tests/library/iter-adapter-stl-test.cpp +++ b/tests/library/iter-adapter-stl-test.cpp @@ -25,12 +25,12 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "lib/test/test-coll.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include "lib/iter-adapter-stl.hpp" #include -#include #include @@ -41,8 +41,6 @@ namespace test{ using ::Test; using boost::lexical_cast; using util::isnil; - using std::cout; - using std::endl; namespace iter = lib::iter_stl; diff --git a/tests/library/iter-adapter-test.cpp b/tests/library/iter-adapter-test.cpp index 2f40f3f70..6cebd109c 100644 --- a/tests/library/iter-adapter-test.cpp +++ b/tests/library/iter-adapter-test.cpp @@ -25,12 +25,12 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" #include "lib/util-foreach.hpp" +#include "lib/format-cout.hpp" #include "lib/iter-adapter.hpp" #include "lib/iter-adapter-ptr-deref.hpp" #include -#include #include @@ -43,8 +43,6 @@ namespace test{ using util::for_each; using util::isnil; using std::vector; - using std::cout; - using std::endl; namespace { diff --git a/tests/library/iter-explorer-test.cpp b/tests/library/iter-explorer-test.cpp index fecaae6c9..f22981e8d 100644 --- a/tests/library/iter-explorer-test.cpp +++ b/tests/library/iter-explorer-test.cpp @@ -25,12 +25,12 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "lib/iter-adapter-stl.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include "lib/iter-explorer.hpp" #include -#include #include #include #include @@ -44,8 +44,6 @@ namespace test{ using ::Test; using util::isnil; using util::isSameObject; - using std::cout; - using std::endl; using std::string; using lib::iter_stl::eachElm; using lib::iter_explorer::ChainedIters; diff --git a/tests/library/iter-source-test.cpp b/tests/library/iter-source-test.cpp index 019f8c80a..fdf6ccc5c 100644 --- a/tests/library/iter-source-test.cpp +++ b/tests/library/iter-source-test.cpp @@ -24,7 +24,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "lib/time/diagnostics.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include "lib/iter-source.hpp" @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -55,8 +54,6 @@ namespace test{ using std::string; using std::list; using std::rand; - using std::cout; - using std::endl; diff --git a/tests/library/itertools-test.cpp b/tests/library/itertools-test.cpp index 0eef44874..04b1ba088 100644 --- a/tests/library/itertools-test.cpp +++ b/tests/library/itertools-test.cpp @@ -24,13 +24,13 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "lib/util.hpp" #include "lib/util-foreach.hpp" +#include "lib/format-cout.hpp" +#include "lib/util.hpp" #include "lib/itertools.hpp" #include -#include #include #include @@ -44,8 +44,6 @@ namespace test{ using util::for_each; using util::isnil; using std::vector; - using std::cout; - using std::endl; using std::rand; using lumiera::error::LUMIERA_ERROR_ITER_EXHAUST; diff --git a/tests/library/meta/access-casted-test.cpp b/tests/library/meta/access-casted-test.cpp index a725343d1..47ecde2f3 100644 --- a/tests/library/meta/access-casted-test.cpp +++ b/tests/library/meta/access-casted-test.cpp @@ -25,17 +25,15 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "lib/access-casted.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include #include #include using std::move; using std::string; using std::ostream; -using std::cout; -using std::endl; using util::isSameObject; diff --git a/tests/library/meta/config-flags-test.cpp b/tests/library/meta/config-flags-test.cpp index 1129f0b60..906b29f0b 100644 --- a/tests/library/meta/config-flags-test.cpp +++ b/tests/library/meta/config-flags-test.cpp @@ -44,15 +44,13 @@ #include "lib/meta/configflags.hpp" #include "meta/typelist-diagnostics.hpp" #include "proc/engine/nodewiring-config.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include using ::test::Test; using util::_Fmt; using std::string; -using std::cout; -using std::endl; namespace lib { diff --git a/tests/library/meta/generator-combinations-test.cpp b/tests/library/meta/generator-combinations-test.cpp index 48aaed0d6..e63665502 100644 --- a/tests/library/meta/generator-combinations-test.cpp +++ b/tests/library/meta/generator-combinations-test.cpp @@ -26,13 +26,11 @@ #include "lib/meta/generator-combinations.hpp" #include "meta/typelist-diagnostics.hpp" #include "lib/format-string.hpp" +#include "lib/format-cout.hpp" -#include using ::test::Test; using std::string; -using std::cout; -using std::endl; namespace lib { diff --git a/tests/library/meta/iterable-classification-test.cpp b/tests/library/meta/iterable-classification-test.cpp index 00108c385..8f0c5f4d4 100644 --- a/tests/library/meta/iterable-classification-test.cpp +++ b/tests/library/meta/iterable-classification-test.cpp @@ -30,9 +30,6 @@ #include "lib/util-foreach.hpp" #include "lib/itertools.hpp" -/////////////////////////////////////////////////////////////TODO draft -#include -/////////////////////////////////////////////////////////////TODO draft #include #include #include diff --git a/tests/library/meta/typelist-test.cpp b/tests/library/meta/typelist-test.cpp index b32c19df7..a1f9ede6f 100644 --- a/tests/library/meta/typelist-test.cpp +++ b/tests/library/meta/typelist-test.cpp @@ -78,10 +78,10 @@ namespace test { void run (Arg) { - AssembledClass wow_me_has_numbers; + AssembledClass wow_me_haz_numbers; cout << "\n..Size of = " - << sizeof(wow_me_has_numbers) <<"\n"; + << sizeof(wow_me_haz_numbers) <<"\n"; } }; diff --git a/tests/library/meta/virtual-copy-support-test.cpp b/tests/library/meta/virtual-copy-support-test.cpp index 64214da35..d3a644588 100644 --- a/tests/library/meta/virtual-copy-support-test.cpp +++ b/tests/library/meta/virtual-copy-support-test.cpp @@ -26,17 +26,16 @@ #include "lib/format-string.hpp" #include "lib/test/test-helper.hpp" #include "lib/meta/virtual-copy-support.hpp" +#include "lib/format-string.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include #include #include using util::_Fmt; using util::isnil; using std::string; -using std::cout; -using std::endl; using lumiera::error::LUMIERA_ERROR_LOGIC; using lumiera::error::LUMIERA_ERROR_WRONG_TYPE; @@ -292,9 +291,9 @@ namespace test { Regular<'A'> aa(a); Regular<'A'> a1; - cout << string(a) < ccc(std::move(cc)); - cout << string(cc) < d; OnlyMovable<'D'> dd (std::move(d)); - cout << string(d) < #include @@ -33,8 +33,6 @@ namespace lib { namespace test{ - using std::cout; - using std::endl; using std::bind; using std::function; using std::placeholders::_1; diff --git a/tests/library/multifact-singleton-test.cpp b/tests/library/multifact-singleton-test.cpp index 6bc9e1978..08ce5e1eb 100644 --- a/tests/library/multifact-singleton-test.cpp +++ b/tests/library/multifact-singleton-test.cpp @@ -24,10 +24,10 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "lib/multifact.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include -#include #include @@ -41,8 +41,6 @@ namespace test{ using util::isnil; using std::ostream; using std::string; - using std::cout; - using std::endl; using lumiera::error::LUMIERA_ERROR_INVALID; @@ -52,11 +50,9 @@ namespace test{ struct Interface { virtual ~Interface() {}; - virtual operator string () =0; + virtual operator string () const =0; }; - inline ostream& operator<< (ostream& os, Interface& ifa) { return os << string(ifa); } - enum theID { ONE = 1 @@ -72,7 +68,7 @@ namespace test{ class Implementation : public Interface { - operator string() override + operator string() const override { return "Impl-"+lexical_cast (ii); } diff --git a/tests/library/query-text-test.cpp b/tests/library/query-text-test.cpp index 83473a81c..d9fb8d19b 100644 --- a/tests/library/query-text-test.cpp +++ b/tests/library/query-text-test.cpp @@ -27,17 +27,12 @@ #include "lib/query-text.hpp" #include "lib/util.hpp" -//#include -//#include #include //#include -//using boost::lexical_cast; using util::contains; using util::isnil; using std::string; -//using std::cout; -//using std::endl; namespace lib { namespace test{ diff --git a/tests/library/query/query-utils-test.cpp b/tests/library/query/query-utils-test.cpp index 75f0ff63e..4e2b3eae6 100644 --- a/tests/library/query/query-utils-test.cpp +++ b/tests/library/query/query-utils-test.cpp @@ -27,9 +27,9 @@ #include "lib/query-util.hpp" #include "lib/cmdline.hpp" #include "lib/query-diagnostics.hpp" +#include "lib/format-cout.hpp" #include -#include using lib::Cmdline; using util::isnil; @@ -39,8 +39,6 @@ using util::for_each; using std::placeholders::_1; using std::bind; using std::string; -using std::cout; -using std::endl; diff --git a/tests/library/removefromsettest.cpp b/tests/library/removefromsettest.cpp index d2969ec8f..ec30fc2bc 100644 --- a/tests/library/removefromsettest.cpp +++ b/tests/library/removefromsettest.cpp @@ -23,16 +23,17 @@ #include "lib/test/run.hpp" #include "lib/util-foreach.hpp" +#include "lib/format-cout.hpp" +#include "lib/format-util.hpp" #include #include -#include #include #include -using std::cout; -using std::string; +using util::join; using std::function; +using std::string; @@ -48,9 +49,9 @@ namespace test { void show (IntSet const& coll) { - cout << "[ "; - for_each (coll, [](uint elm) { cout << elm << ", "; }); - cout << "]\n"; + cout << "[ " + << join (coll) + << "]" < diff --git a/tests/library/search-path-splitter-test.cpp b/tests/library/search-path-splitter-test.cpp index ac0510bac..5f9cd6d4b 100644 --- a/tests/library/search-path-splitter-test.cpp +++ b/tests/library/search-path-splitter-test.cpp @@ -23,13 +23,10 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" +#include "lib/format-cout.hpp" #include "lib/searchpath.hpp" -#include - -using std::cout; -using std::endl; diff --git a/tests/library/singleton-subclass-test.cpp b/tests/library/singleton-subclass-test.cpp index 18945e890..0fa36c40a 100644 --- a/tests/library/singleton-subclass-test.cpp +++ b/tests/library/singleton-subclass-test.cpp @@ -24,20 +24,19 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "lib/format-string.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include "test-target-obj.hpp" #include "lib/depend.hpp" #include -#include using boost::lexical_cast; using util::isSameObject; using util::_Fmt; using util::isnil; using std::string; -using std::cout; namespace lib { @@ -118,8 +117,8 @@ namespace test{ CHECK (isSameObject (t1, t2), "not a Singleton, got two different instances." ); cout << "calling a non-static method on the Singleton-" - << t1.identify() << "\n" - << string (t1) << "\n"; + << t1.identify() << endl + << t1 << endl; verify_error_detection (); } diff --git a/tests/library/singleton-test.cpp b/tests/library/singleton-test.cpp index 81ee8d599..dfe5c4998 100644 --- a/tests/library/singleton-test.cpp +++ b/tests/library/singleton-test.cpp @@ -23,22 +23,19 @@ #include "lib/test/run.hpp" #include "lib/format-string.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" #include "test-target-obj.hpp" #include "lib/depend.hpp" -#include #include -#include -using std::function; using boost::lexical_cast; using util::isSameObject; using util::_Fmt; using util::isnil; using std::string; -using std::cout; namespace lib { @@ -93,8 +90,8 @@ namespace test{ CHECK (isSameObject(t1, t2), "not a Singleton, got two different instances." ); - cout << "calling a non-static method on the Singleton instance\n" - << string (t1) << "\n"; + cout << "calling a non-static method on the Singleton instance" < -#include -#include +#include "lib/format-cout.hpp" +#include "lib/format-string.hpp" -using boost::lexical_cast; -using boost::format; +using util::_Fmt; using util::isnil; -using std::string; -using std::cout; namespace lib { @@ -49,7 +45,7 @@ namespace test{ { int callCnt_; Symbol typid_; - format msg_; + _Fmt msg_; public: TestSingletonO(Symbol ty="TestSingletonO") diff --git a/tests/library/sub-id-test.cpp b/tests/library/sub-id-test.cpp index 0c9e17534..fc668224e 100644 --- a/tests/library/sub-id-test.cpp +++ b/tests/library/sub-id-test.cpp @@ -24,6 +24,7 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" #include "lib/util-foreach.hpp" +#include "lib/format-cout.hpp" #include "lib/sub-id.hpp" @@ -45,8 +46,6 @@ namespace test{ using boost::hash; using std::vector; using std::string; - using std::cout; - using std::endl; diff --git a/tests/library/test-target-obj.hpp b/tests/library/test-target-obj.hpp index 7b0b3b402..0f6279b3e 100644 --- a/tests/library/test-target-obj.hpp +++ b/tests/library/test-target-obj.hpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" #include "lib/format-string.hpp" +#include "lib/format-cout.hpp" #include -#include #include @@ -39,7 +39,6 @@ namespace test{ using util::_Fmt; using boost::lexical_cast; using std::string; - using std::cout; /** * Target object to be created by Test-Factories or as Singleton. diff --git a/tests/library/test/test-helper-test.cpp b/tests/library/test/test-helper-test.cpp index 998952165..61aefa304 100644 --- a/tests/library/test/test-helper-test.cpp +++ b/tests/library/test/test-helper-test.cpp @@ -25,10 +25,10 @@ #include "lib/test/test-helper.hpp" #include "lib/error.hpp" #include "lib/util-foreach.hpp" +#include "lib/format-cout.hpp" #include #include -#include #include using util::for_each; @@ -40,8 +40,6 @@ using boost::algorithm::is_lower; using boost::algorithm::is_digit; using std::function; using std::string; -using std::cout; -using std::endl; namespace lib { diff --git a/tests/library/test/test-helper-variadic-test.cpp b/tests/library/test/test-helper-variadic-test.cpp index 2997bb688..99474557b 100644 --- a/tests/library/test/test-helper-variadic-test.cpp +++ b/tests/library/test/test-helper-variadic-test.cpp @@ -104,7 +104,7 @@ namespace test{ Impl obj; Interface const& ref = obj; - cout << "--no-arg--\n" << showVariadicTypes() <<"\n"; + cout << "--no-arg--\n" << showVariadicTypes() <<"\n"; cout << "--value--\n" << showVariadicTypes(d) <<"\n"; cout << "--reference--\n" << showVariadicTypes(d) <<"\n"; cout << "--move--\n" << showVariadicTypes(d) <<"\n"; diff --git a/tests/library/test/test-option-test.cpp b/tests/library/test/test-option-test.cpp index efde8c0ae..b1fdc2032 100644 --- a/tests/library/test/test-option-test.cpp +++ b/tests/library/test/test-option-test.cpp @@ -23,13 +23,12 @@ #include "lib/test/run.hpp" #include "lib/test/testoption.hpp" +#include "lib/format-cout.hpp" #include "lib/util.hpp" -#include using lib::Cmdline; using util::isnil; -using std::endl; namespace test { @@ -58,14 +57,14 @@ namespace test { /** @test performs the actual test for the option parser test::TestOption */ void doIt (const string cmdline) { - std::cout << "Testing invocation with cmdline: " << cmdline << "..." << endl; + cout << "Testing invocation with cmdline: " << cmdline << "..." << endl; Cmdline args(cmdline); TestOption optparser (args); const string testID = optparser.getTestID(); - std::cout << "--> Testgroup=" << optparser.getTestgroup() << endl; - std::cout << "--> Test-ID =" << (isnil(testID)? "--missing--" : testID ) << endl; - std::cout << "--> remaining=" << args << endl; + cout << "--> Testgroup=" << optparser.getTestgroup() << endl; + cout << "--> Test-ID =" << (isnil(testID)? "--missing--" : testID ) << endl; + cout << "--> remaining=" << args << endl; } void noOptions() { doIt (""); } diff --git a/tests/library/util-floordiv-test.cpp b/tests/library/util-floordiv-test.cpp index ba2c75822..0ee9d4788 100644 --- a/tests/library/util-floordiv-test.cpp +++ b/tests/library/util-floordiv-test.cpp @@ -25,17 +25,17 @@ #include "lib/util-quant.hpp" #include "lib/util.hpp" +#include "lib/format-cout.hpp" +#include "lib/format-string.hpp" + #include #include #include -#include -#include using ::Test; -using std::cout; using std::rand; using util::isnil; -using boost::format; +using util::_Fmt; namespace util { @@ -215,7 +215,7 @@ namespace test { typedef VecI::const_iterator I; clock_t start(0), stop(0); - format resultDisplay("timings(%s)%|30T.|%5.3fsec\n"); + _Fmt resultDisplay{"timings(%s)%|30T.|%5.3fsec\n"}; #define START_TIMINGS start=clock(); #define DISPLAY_TIMINGS(ID) \ diff --git a/tests/library/util-floorwrap-test.cpp b/tests/library/util-floorwrap-test.cpp index 20b16e69f..20e6e2908 100644 --- a/tests/library/util-floorwrap-test.cpp +++ b/tests/library/util-floorwrap-test.cpp @@ -23,17 +23,14 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" +#include "lib/format-string.hpp" +#include "lib/format-cout.hpp" #include "lib/util-quant.hpp" #include -#include -#include #include using ::Test; -using std::cout; -using std::endl; -using boost::format; using boost::lexical_cast; using lib::test::showType; using util::floorwrap; @@ -88,10 +85,10 @@ namespace test { showWrap (I val, I scale) { IDiv wrap = floorwrap(val,scale); - cout << format ("% 3d /% 1d =% 1d %% =% d floor=% 4.1f wrap = (%2d,%2d)\n") - % val % scale % (val/scale) - % (val%scale) % floor(double(val)/scale) - % wrap.quot % wrap.rem; + cout << _Fmt ("% 3d /% 1d =% 1d %% =% d floor=% 4.1f wrap = (%2d,%2d)\n") + % val % scale % (val/scale) + % (val%scale) % floor(double(val)/scale) + % wrap.quot % wrap.rem; } }; diff --git a/tests/library/variant-test.cpp b/tests/library/variant-test.cpp index 187bebac0..5905f44db 100644 --- a/tests/library/variant-test.cpp +++ b/tests/library/variant-test.cpp @@ -25,12 +25,11 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "lib/time/timevalue.hpp" -#include "lib/format-util.hpp" +#include "lib/format-cout.hpp" #include "lib/variant.hpp" #include "lib/util.hpp" -#include #include @@ -45,8 +44,6 @@ namespace test{ using util::contains; using std::string; - using std::cout; - using std::endl; using error::LUMIERA_ERROR_WRONG_TYPE; using error::LUMIERA_ERROR_LOGIC; @@ -96,10 +93,10 @@ namespace test{ //// does not compile.... // TestVariant evil(3.1415); - cout << string(v0) < #include #include using std::string; using util::_Fmt; using std::vector; -using std::cout; namespace lib { @@ -159,7 +158,7 @@ namespace test{ { VerboseRenderer receiver; for (Verb verb : tokens) - cout << "consuming " << string(verb) + cout << "consuming " << verb << " -> '" << verb.applyTo(receiver) << "'\n"; diff --git a/tests/operation/bugs/hello-bug-test.cpp b/tests/operation/bugs/hello-bug-test.cpp index 69bd74a98..34f7e45fb 100644 --- a/tests/operation/bugs/hello-bug-test.cpp +++ b/tests/operation/bugs/hello-bug-test.cpp @@ -41,10 +41,10 @@ namespace test { : public Test { virtual void - run(Arg) - { - std::cerr << "hello sunshine, no bugs whatsoever" <