Fix class vs struct conflict. Put operator in the correct namespace.


(joerg)

$NetBSD: patch-engine_metadata.hpp,v 1.1 2013/03/02 18:16:39 joerg Exp $

--- engine/metadata.hpp.orig	2013-02-28 21:58:41.000000000 +0000
+++ engine/metadata.hpp
@@ -44,7 +44,7 @@
 
 namespace utils {
 namespace config { class tree; }
-namespace datetime { class delta; }
+namespace datetime { struct delta; }
 namespace fs { class path; }
 namespace units { class bytes; }
 }  // namespace utils

$NetBSD: patch-utils_units.cpp,v 1.1 2013/03/02 18:16:39 joerg Exp $

--- utils/units.cpp.orig	2013-02-28 22:07:12.000000000 +0000
+++ utils/units.cpp
@@ -143,7 +143,7 @@ units::bytes::operator uint64_t(void) co
 ///
 /// \post The bad bit of input is set to 1 if the parsing failed.
 std::istream&
-operator>>(std::istream& input, units::bytes& rhs)
+units::operator>>(std::istream& input, units::bytes& rhs)
 {
     std::string word;
     input >> word;
@@ -166,7 +166,7 @@ operator>>(std::istream& input, units::b
 ///
 /// \return The output stream.
 std::ostream&
-operator<<(std::ostream& output, const units::bytes& rhs)
+units::operator<<(std::ostream& output, const units::bytes& rhs)
 {
     return (output << rhs.format());
 }

$NetBSD: patch-utils_units.hpp,v 1.1 2013/03/02 18:16:39 joerg Exp $

--- utils/units.hpp.orig	2013-02-28 22:00:54.000000000 +0000
+++ utils/units.hpp
@@ -83,11 +83,11 @@ public:
     operator uint64_t(void) const;
 };
 
+std::istream& operator>>(std::istream&, bytes&);
+std::ostream& operator<<(std::ostream&, const bytes&);
 
 }  // namespace units
 }  // namespace utils
 
-std::istream& operator>>(std::istream&, utils::units::bytes&);
-std::ostream& operator<<(std::ostream&, const utils::units::bytes&);
 
 #endif  // !defined(UTILS_UNITS_HPP)