diff --git a/tests/asserthelper.cpp b/tests/asserthelper.cpp index 2b0e91e692..b244d5dd8b 100644 --- a/tests/asserthelper.cpp +++ b/tests/asserthelper.cpp @@ -14,7 +14,7 @@ #include "asserthelper.h" -namespace +namespace wxTestPrivate { std::ostream& operator<<(std::ostream& os, const ColourChannel& cc) { @@ -23,10 +23,12 @@ namespace os << static_cast(cc.m_value); return os; } -} // anonymous namespace +} std::ostream& operator<<(std::ostream& os, const wxColour& c) { + using wxTestPrivate::ColourChannel; + os << std::hex << std::noshowbase << "(" << ColourChannel(c.Red()) << ", " diff --git a/tests/asserthelper.h b/tests/asserthelper.h index ebd16c2d3e..ce8c9c6a29 100644 --- a/tests/asserthelper.h +++ b/tests/asserthelper.h @@ -14,7 +14,7 @@ #include "wx/gdicmn.h" #include "wx/font.h" -namespace +namespace wxTestPrivate { // by default colour components values are output incorrectly because they // are unsigned chars, define a small helper struct which formats them in @@ -27,8 +27,7 @@ namespace }; std::ostream& operator<<(std::ostream& os, const ColourChannel& cc); - -} // anonymous namespace +} // wxTestPrivate namespace // this operator is needed to use CPPUNIT_ASSERT_EQUAL with wxColour objects std::ostream& operator<<(std::ostream& os, const wxColour& c);