nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

Move output operators into target's namespace

Browse Source
This commit is contained in:
Danny Robson 2012-04-24 18:12:07 +10:00
parent 99bdd49f2f
commit ed990ba889
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
colour.cpp
View File

@ -35,7 +35,7 @@ colour::operator*= (double v) {
const json::node& const json::node&
operator>> (const json::node &node, colour &c) { util::operator>> (const json::node &node, colour &c) {
c.red = node[0].as_number (); c.red = node[0].as_number ();
c.green = node[1].as_number (); c.green = node[1].as_number ();
c.blue = node[2].as_number (); c.blue = node[2].as_number ();
@ -68,7 +68,7 @@ namespace util {
std::ostream& std::ostream&
operator<< (std::ostream &os, const util::colour &c) { util::operator<< (std::ostream &os, const util::colour &c) {
os << "colour(" << c.red << ", " << c.green << ", " << c.blue << ", " << c.alpha << ")"; os << "colour(" << c.red << ", " << c.green << ", " << c.blue << ", " << c.alpha << ")";
return os; return os;
} }

5
colour.hpp
View File

@ -37,9 +37,10 @@ namespace util {
template <> colour& randomise (colour&); template <> colour& randomise (colour&);
template <> colour& random (void); template <> colour& random (void);
std::ostream& operator<< (std::ostream&, const util::colour&);
const json::node& operator>> (const json::node&, util::colour&);
} }
std::ostream& operator<< (std::ostream&, const util::colour&);
const json::node& operator>> (const json::node&, util::colour&);
#endif #endif

2
json/validate.cpp
View File

@ -25,7 +25,7 @@ main (int argc, char ** argv) {
try { try {
json::parse (boost::filesystem::path (argv[ARG_PATH])); json::parse (boost::filesystem::path (argv[ARG_PATH]));
} catch (json::error &x) { } catch (json::error &x) {
std::cerr << x.what () << std::endl; std::cerr << "Error: " << x.what () << std::endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

6
vector.cpp
View File

@ -193,19 +193,19 @@ vector::sanity (void) const {
util::vector util::vector
operator* (double a, const util::vector &b) util::operator* (double a, const util::vector &b)
{ return b * a; } { return b * a; }
std::ostream& std::ostream&
operator<< (std::ostream &os, const util::vector &v) { util::operator<< (std::ostream &os, const util::vector &v) {
os << "vec(" << v.x << ", " << v.y << ", " << v.z << ")"; os << "vec(" << v.x << ", " << v.y << ", " << v.z << ")";
return os; return os;
} }
const json::node& const json::node&
operator>> (const json::node &node, util::vector &v) { util::operator>> (const json::node &node, util::vector &v) {
v.x = node[0].as_number (); v.x = node[0].as_number ();
v.y = node[1].as_number (); v.y = node[1].as_number ();
v.z = node[2].as_number (); v.z = node[2].as_number ();

9
vector.hpp
View File

@ -58,11 +58,14 @@ namespace util {
void sanity (void) const; void sanity (void) const;
}; };
util::vector operator* (double, const util::vector&);
std::ostream& operator<< (std::ostream&, const util::vector&);
const json::node& operator>> (const json::node&, util::vector&);
} }
util::vector operator* (double, const util::vector&);
std::ostream& operator<< (std::ostream&, const util::vector&);
const json::node& operator>> (const json::node&, util::vector&);
#endif #endif