Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Stop using u8string which breaks in C++20 #36696

Merged
merged 2 commits into from
Oct 18, 2022
Merged

Stop using u8string which breaks in C++20 #36696

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b620325
Stop using u8string which breaks in C++20
Oct 10, 2022
5447fe4
Inline c_str calls
Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions shell/platform/glfw/flutter_glfw.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ UniqueAotDataPtr LoadAotData(std::filesystem::path aot_data_path) {
return nullptr;
}
if (!std::filesystem::exists(aot_data_path)) {
std::cerr << "Can't load AOT data from " << aot_data_path.u8string()
std::cerr << "Can't load AOT data from " << aot_data_path.string()
<< "; no such file." << std::endl;
return nullptr;
}
Expand Down Expand Up @@ -664,10 +664,6 @@ static bool RunFlutterEngine(
std::filesystem::path(executable_location) / aot_library_path;
}
}
std::string assets_path_string = assets_path.u8string();
std::string icu_path_string = icu_path.u8string();
std::string lib_path_string = aot_library_path.u8string();

// Configure a task runner using the event loop.
engine_state->event_loop = std::move(event_loop);
FlutterTaskRunnerDescription platform_task_runner = {};
Expand All @@ -691,15 +687,15 @@ static bool RunFlutterEngine(
}
FlutterProjectArgs args = {};
args.struct_size = sizeof(FlutterProjectArgs);
args.assets_path = assets_path_string.c_str();
args.icu_data_path = icu_path_string.c_str();
args.assets_path = assets_path.c_str();
args.icu_data_path = icu_path.c_str();
args.command_line_argc = static_cast<int>(argv.size());
args.command_line_argv = &argv[0];
args.platform_message_callback = EngineOnFlutterPlatformMessage;
args.custom_task_runners = &task_runners;

if (FlutterEngineRunsAOTCompiledDartCode()) {
engine_state->aot_data = LoadAotData(lib_path_string);
engine_state->aot_data = LoadAotData(aot_library_path);
if (!engine_state->aot_data) {
std::cerr << "Unable to start engine without AOT data." << std::endl;
return false;
Expand Down