From: Christopher Dykes Date: Wed, 23 Nov 2016 23:19:57 +0000 (-0800) Subject: Don't expect .native() to return a string X-Git-Tag: v2016.11.28.00~6 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4abc2aa09708de554ce1b950df8c76ad19090ece;p=folly.git Don't expect .native() to return a string Summary: It's called `.native()` for a reason, and returns a `wstring` on windows, so call `string()` instead. Reviewed By: yfeldblum Differential Revision: D4229254 fbshipit-source-id: d5f9658b41f45fd719ca3e878a2e61c9dce24f10 --- diff --git a/folly/experimental/test/NestedCommandLineAppTest.cpp b/folly/experimental/test/NestedCommandLineAppTest.cpp index d4b749c0..597b15f7 100644 --- a/folly/experimental/test/NestedCommandLineAppTest.cpp +++ b/folly/experimental/test/NestedCommandLineAppTest.cpp @@ -32,7 +32,7 @@ std::string getHelperPath() { if (!fs::exists(path)) { path = path.parent_path().parent_path() / basename / basename; } - return path.native(); + return path.string(); } std::string callHelper(std::initializer_list args, diff --git a/folly/experimental/test/ProgramOptionsTest.cpp b/folly/experimental/test/ProgramOptionsTest.cpp index c54dd54b..cd95970c 100644 --- a/folly/experimental/test/ProgramOptionsTest.cpp +++ b/folly/experimental/test/ProgramOptionsTest.cpp @@ -33,7 +33,7 @@ std::string getHelperPath() { if (!fs::exists(path)) { path = path.parent_path().parent_path() / basename / basename; } - return path.native(); + return path.string(); } std::string callHelper(ProgramOptionsStyle style,