Skip to content

Commit 42809ea

Browse files
authored
[tools/val] fix u8str for real this time (KhronosGroup#6341)
Really fix the problem from KhronosGroup#6336 Actually use the std::string filepath when calling the helper function. Also, remove spurious blank lines from build_defs.bzl. Google's internal linter complains about them.
1 parent f3b6c44 commit 42809ea

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

build_defs.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ def _merge_dicts(dicts):
6060
merged.update(d)
6161
return merged
6262

63-
6463
def ExtInst(name, target = "", prefix = ""):
6564
"""
6665
Returns a dictionary specifying the info needed to
@@ -78,7 +77,6 @@ def ExtInst(name, target = "", prefix = ""):
7877
"""
7978
return {"name": name, "target": target, "prefix": prefix}
8079

81-
8280
def _extinst_grammar_target(e):
8381
"""
8482
Args: e, as returned from extinst

tools/val/val.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ int main(int argc, char** argv) {
273273
const auto filepath_u8str = filepath.u8string();
274274
const std::string filepath_str(filepath_u8str.begin(),
275275
filepath_u8str.end());
276-
if (!process_single_file(filepath.u8string().c_str(), target_env, options,
276+
if (!process_single_file(filepath_str.c_str(), target_env, options,
277277
false)) {
278278
succeed = false;
279279
}

0 commit comments

Comments
 (0)