diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-11-10 17:32:27 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-11-10 17:39:47 -0800 |
| commit | c3344e8a6d7402326204d1232a4c5ffa382f70a9 (patch) | |
| tree | ab7863cddb787caecfc4ac303bdcbf3cca13e831 /tools/split-select/TestRules.cpp | |
| parent | 85d558cd486d195aabfc4b43cff8f338126f60a5 (diff) | |
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
Diffstat (limited to 'tools/split-select/TestRules.cpp')
| -rw-r--r-- | tools/split-select/TestRules.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<Rule>& 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() |