Replace anonymous namespace with a named one in the test helpers.

This should avoid clang warnings about the function in anonymous namespace
being unused.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-07-14 19:17:12 +00:00
parent 4cbf03f4ec
commit 789f1a7975
2 changed files with 10 additions and 4 deletions

View File

@@ -14,6 +14,9 @@
#include "asserthelper.h" #include "asserthelper.h"
namespace wxTestPrivate
{
std::ostream& operator<<(std::ostream& os, const ColourChannel& cc) std::ostream& operator<<(std::ostream& os, const ColourChannel& cc)
{ {
os.width(2); os.width(2);
@@ -22,8 +25,12 @@ std::ostream& operator<<(std::ostream& os, const ColourChannel& cc)
return os; return os;
} }
}
std::ostream& operator<<(std::ostream& os, const wxColour& c) std::ostream& operator<<(std::ostream& os, const wxColour& c)
{ {
using wxTestPrivate::ColourChannel;
os << std::hex << std::noshowbase os << std::hex << std::noshowbase
<< "(" << "("
<< ColourChannel(c.Red()) << ", " << ColourChannel(c.Red()) << ", "

View File

@@ -14,7 +14,7 @@
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/font.h" #include "wx/font.h"
namespace namespace wxTestPrivate
{ {
// by default colour components values are output incorrectly because they // by default colour components values are output incorrectly because they
// are unsigned chars, define a small helper struct which formats them in // are unsigned chars, define a small helper struct which formats them in
@@ -26,9 +26,8 @@ namespace
unsigned char m_value; unsigned char m_value;
}; };
} // anonymous namespace
std::ostream& operator<<(std::ostream& os, const ColourChannel& cc); std::ostream& operator<<(std::ostream& os, const ColourChannel& cc);
} // wxTestPrivate namespace
// this operator is needed to use CPPUNIT_ASSERT_EQUAL with wxColour objects // this operator is needed to use CPPUNIT_ASSERT_EQUAL with wxColour objects
std::ostream& operator<<(std::ostream& os, const wxColour& c); std::ostream& operator<<(std::ostream& os, const wxColour& c);