Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

libethereum/LogFilter.cpp

@@ -27,7 +27,7 @@ using namespace std;
 using namespace dev;
 using namespace dev::eth;
 
-std::ostream& dev::operator<<(std::ostream& _out, LogFilter const& _s)
+std::ostream& dev::eth::operator<<(std::ostream& _out, LogFilter const& _s)
 {
 	// TODO
 	_out << "(@" << _s.m_addresses << "#" << _s.m_topics << ">" << _s.m_earliest << "-" << _s.m_latest << "< +" << _s.m_skip << "^" << _s.m_max << ")";

libethereum/LogFilter.h

@@ -34,12 +34,12 @@ namespace eth
 class LogFilter;
 }
 
-/// Simple stream output for the StateDiff.
-std::ostream& operator<<(std::ostream& _out, dev::eth::LogFilter const& _s);
-
 namespace eth
 {
 
+/// Simple stream output for the StateDiff.
+std::ostream& operator<<(std::ostream& _out, dev::eth::LogFilter const& _s);
+
 class State;
 
 class LogFilter
@@ -65,7 +65,7 @@ public:
 	LogFilter withEarliest(int _e) { m_earliest = _e; return *this; }
 	LogFilter withLatest(int _e) { m_latest = _e; return *this; }
 
-	friend std::ostream& dev::operator<<(std::ostream& _out, dev::eth::LogFilter const& _s);
+	friend std::ostream& dev::eth::operator<<(std::ostream& _out, dev::eth::LogFilter const& _s);
 
 private:
 	AddressSet m_addresses;