Merge "libbinder: Status s/stringstream/ostream/" (5e36c715) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/binder/Status.cpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -245,10 +245,5 @@ String8 Status::toString8() const {
		return ret;
		}

		std::stringstream& operator<< (std::stringstream& stream, const Status& s) {
		stream << s.toString8().string();
		return stream;
		}

		} // namespace binder
		} // namespace android

+5 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,8 @@
		#define ANDROID_BINDER_STATUS_H

		#include <cstdint>
		#include <sstream>
		#include <sstream> // historical
		#include <ostream>

		#include <binder/Parcel.h>
		#include <utils/String8.h>
		@@ -153,8 +154,9 @@ private:
		String8 mMessage;
		}; // class Status

		// For gtest output logging
		std::stringstream& operator<< (std::stringstream& stream, const Status& s);
		static inline std::ostream& operator<< (std::ostream& o, const Status& s) {
		return o << s.toString8();
		}

		} // namespace binder
		} // namespace android