diff options
| author | Tetsuya Hayashi <tetsu.h@gmail.com> | 2020-12-15 02:50:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 09:50:58 -0800 |
| commit | 43e0f1bce37bff55cd8c29bf304da36a3cff823f (patch) | |
| tree | 16620f51044a2e09dfbfd72eeb2857e027ea063b | |
| parent | 81b67c387848731aefacc19aea7f41364e5d5ba2 (diff) | |
| download | vcpkg-43e0f1bce37bff55cd8c29bf304da36a3cff823f.tar.gz vcpkg-43e0f1bce37bff55cd8c29bf304da36a3cff823f.zip | |
Avoid C4819 warning during bootstrap-vcpkg.bat (#15095)
| -rw-r--r-- | toolsrc/src/vcpkg/export.prefab.cpp | 52 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/registries.cpp | 3 |
2 files changed, 28 insertions, 27 deletions
diff --git a/toolsrc/src/vcpkg/export.prefab.cpp b/toolsrc/src/vcpkg/export.prefab.cpp index a1a6eb5f1..ce4e0cf6a 100644 --- a/toolsrc/src/vcpkg/export.prefab.cpp +++ b/toolsrc/src/vcpkg/export.prefab.cpp @@ -335,32 +335,32 @@ namespace vcpkg::Export::Prefab /* prefab - └── <name> - ├── aar - │ ├── AndroidManifest.xml - │ ├── META-INF - │ │ └── LICENCE - │ └── prefab - │ ├── modules - │ │ └── <module> - │ │ ├── include - │ │ ├── libs - │ │ │ ├── android.arm64-v8a - │ │ │ │ ├── abi.json - │ │ │ │ └── lib<module>.so - │ │ │ ├── android.armeabi-v7a - │ │ │ │ ├── abi.json - │ │ │ │ └── lib<module>.so - │ │ │ ├── android.x86 - │ │ │ │ ├── abi.json - │ │ │ │ └── lib<module>.so - │ │ │ └── android.x86_64 - │ │ │ ├── abi.json - │ │ │ └── lib<module>.so - │ │ └── module.json - │ └── prefab.json - ├── <name>-<version>.aar - └── pom.xml + +-- <name> + +-- aar + | +-- AndroidManifest.xml + | +-- META-INF + | | +-- LICENCE + | +-- prefab + | +-- modules + | | +-- <module> + | | +-- include + | | +-- libs + | | | +-- android.arm64-v8a + | | | | +-- abi.json + | | | | +-- lib<module>.so + | | | +-- android.armeabi-v7a + | | | | +-- abi.json + | | | | +-- lib<module>.so + | | | +-- android.x86 + | | | | +-- abi.json + | | | | +-- lib<module>.so + | | | +-- android.x86_64 + | | | +-- abi.json + | | | +-- lib<module>.so + | | +-- module.json + | +-- prefab.json + +-- <name>-<version>.aar + +-- pom.xml */ std::unordered_map<std::string, std::string> version_map; diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 7794ed9b0..51c8849c9 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -243,7 +243,8 @@ namespace fs::path path_to_registry_database(const VcpkgPaths& paths) const { fs::path path_to_db = paths.config_root_dir / path; - path_to_db /= fs::u8path({'\xF0', '\x9F', '\x98', '\x87'}); // utf-8 for 😇 + path_to_db /= fs::u8path( + {'\xF0', '\x9F', '\x98', '\x87'}); // utf-8 for https://emojipedia.org/smiling-face-with-halo/ return path_to_db; } |