diff --git a/upstream_utils/llvm_patches/0017-Windows-support.patch b/upstream_utils/llvm_patches/0017-Windows-support.patch index 137dcf7b52..19ef6bdf86 100644 --- a/upstream_utils/llvm_patches/0017-Windows-support.patch +++ b/upstream_utils/llvm_patches/0017-Windows-support.patch @@ -91,7 +91,7 @@ index 83d5586ae8a77ec585e7e59df3075ca59cfb9d0c..395965bc6fc969ed9a2d92743a0010dd } // end namespace llvm. diff --git a/llvm/lib/Support/ConvertUTF.cpp b/llvm/lib/Support/ConvertUTF.cpp -index bc04c5ab5113563fb82d7b3b168985369b611f4b..b1012d896bd8ba9e07221f87a358b90fe203b172 100644 +index bc04c5ab5113563fb82d7b3b168985369b611f4b..b865b5589df961813007e57a910dbc14f875426b 100644 --- a/llvm/lib/Support/ConvertUTF.cpp +++ b/llvm/lib/Support/ConvertUTF.cpp @@ -67,6 +67,11 @@ diff --git a/upstream_utils/sleipnir_patches/0003-Use-wpi-byteswap.patch b/upstream_utils/sleipnir_patches/0003-Use-wpi-byteswap.patch index f14e42ed1f..37141f257e 100644 --- a/upstream_utils/sleipnir_patches/0003-Use-wpi-byteswap.patch +++ b/upstream_utils/sleipnir_patches/0003-Use-wpi-byteswap.patch @@ -19,7 +19,7 @@ index 4f4c76204071f90bf49eddb8c2aceb583b5e09ba..03938557c2600a7a1f72c6b93c935602 + ^wpi/ } diff --git a/include/sleipnir/util/spy.hpp b/include/sleipnir/util/spy.hpp -index a2f94803e3744cee771669210d1af883160e9896..43dcc748b679eac89986b154b26a1c0282345d82 100644 +index a2f94803e3744cee771669210d1af883160e9896..74dd7990b03783ce805a186920d5142caeb178c6 100644 --- a/include/sleipnir/util/spy.hpp +++ b/include/sleipnir/util/spy.hpp @@ -12,6 +12,7 @@ diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Casting.hpp b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Casting.hpp index 36da000b02..12136e3a1b 100644 --- a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Casting.hpp +++ b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Casting.hpp @@ -806,7 +806,7 @@ template //===----------------------------------------------------------------------===// /// These are wrappers over isa* function that allow them to be used in generic -/// algorithms such as `wpi:all_of`, `wpi::util::none_of`, etc. This is accomplished +/// algorithms such as `wpi::util:all_of`, `wpi::util::none_of`, etc. This is accomplished /// by exposing the isa* functions through function objects with a generic /// function call operator. diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/raw_os_ostream.hpp b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/raw_os_ostream.hpp index 4fa2b62974..826e622b13 100644 --- a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/raw_os_ostream.hpp +++ b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/raw_os_ostream.hpp @@ -36,6 +36,6 @@ public: ~raw_os_ostream() override; }; -} // end wpi namespace +} // end wpi::util namespace #endif