Merge "Compilation fixes for MSVC" am: 4e04984 am: 5e9105e am: 807e991

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1688811 Change-Id: Ie0f4ac0321a047ab8fefe0baf4882da7e57e406f
ProjectRadiant · Apr 30, 2021 · 8a8e016 · 8a8e016
2 parents e6f5de3 + 807e991
commit 8a8e016
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/gd/packet/parser/gen_cpp.cc b/gd/packet/parser/gen_cpp.cc
@@ -33,7 +33,7 @@ void parse_namespace(
     const std::filesystem::path& input_file_relative_path,
     std::vector<std::string>* token) {
   std::filesystem::path gen_namespace = root_namespace / input_file_relative_path;
-  std::string gen_namespace_str = gen_namespace;
+  std::string gen_namespace_str = gen_namespace.u8string();
   std::regex path_tokenizer("/");
   auto it = std::sregex_token_iterator(gen_namespace_str.cbegin(), gen_namespace_str.cend(), path_tokenizer, -1);
   std::sregex_token_iterator it_end = {};

diff --git a/gd/packet/parser/main.cc b/gd/packet/parser/main.cc
@@ -31,8 +31,9 @@
 
 #include "language_y.h"
 
-void yylex_init(void**);
-void yylex_destroy(void*);
+
+int yylex_init(void**);
+int yylex_destroy(void*);
 void yyset_debug(int, void*);
 void yyset_in(FILE*, void*);