From c3344e8a6d7402326204d1232a4c5ffa382f70a9 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 10 Nov 2014 17:32:27 -0800 Subject: split-select: fix OSX build Clang is a bit stricter about what template definition it chooses for mixed types that are normally possible to cast between. Operations like std::find(int iterator, int iterator, enum) will fail, as Clang won't implicitly cast an enum to an int here. Change-Id: Ib2276c382ebf2b877e1045d32b1a9d0a1fa4d4a4 --- tools/split-select/TestRules.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/split-select/TestRules.cpp') diff --git a/tools/split-select/TestRules.cpp b/tools/split-select/TestRules.cpp index f980dc4c9416..86ccd6a25c18 100644 --- a/tools/split-select/TestRules.cpp +++ b/tools/split-select/TestRules.cpp @@ -75,7 +75,7 @@ const Rule AlwaysTrue() { const char*, const char*, const sp& actual, const Rule& expected) { const String8 expectedStr(expected.toJson()); - const String8 actualStr(actual != NULL ? actual->toJson() : ""); + const String8 actualStr(actual != NULL ? actual->toJson() : String8()); if (expectedStr != actualStr) { return ::testing::AssertionFailure() -- cgit v1.2.3-59-g8ed1b