Avoid C4819 warning during bootstrap-vcpkg.bat (microsoft#15095)

strega-nil · Dec 14, 2020 · 9dbace1 · 9dbace1
1 parent cdae967
commit 9dbace1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/src/vcpkg/export.prefab.cpp b/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/src/vcpkg/registries.cpp b/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;
         }