diff options
| author | 2014-11-11 02:48:01 +0000 | |
|---|---|---|
| committer | 2014-11-11 02:48:01 +0000 | |
| commit | c78b33d01187336d960457980acb05cac86241be (patch) | |
| tree | cddfb4e0dbcede4f69fcb8d4b44459219cb93cb7 /tools/split-select/TestRules.cpp | |
| parent | b45d3b2bd04d96829c3d28704f6ba1012dc4634f (diff) | |
| parent | be593a7778fe053f67fa37dcc2174639ed725b17 (diff) | |
Merge "split-select: fix OSX build" into lmp-mr1-dev
automerge: be593a7
* commit 'be593a7778fe053f67fa37dcc2174639ed725b17':
split-select: fix OSX build
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() |