Merge "libbinder: Remove templated binder::Status stream operator." (9e413e9f) · Commits · e / os / android_frameworks_native

include/binder/Status.h

+2 −5

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

		#include <cstdint>
		#include <sstream>

		#include <binder/Parcel.h>
		#include <utils/String8.h>
		@@ -142,11 +143,7 @@ private:
		}; // class Status

		// For gtest output logging
		template<typename T>
		T& operator<< (T& stream, const Status& s) {
		stream << s.toString8().string();
		return stream;
		}
		std::stringstream& operator<< (std::stringstream& stream, const Status& s);

		} // namespace binder
		} // namespace android

+5 −0

Original line number	Diff line number	Diff line
		@@ -158,5 +158,10 @@ 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