Remove incompatible BUILD.bazel support via rename. Update string.h f…

…or C++ 20.
8thwall · Aug 3, 2023 · a07f07b · a07f07b
1 parent 062662b
commit a07f07b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 3 deletions.
diff --git a/c++/BUILD.bazel → c++/bak.BUILD.bazel b/c++/BUILD.bazel → c++/bak.BUILD.bazel
diff --git a/c++/src/capnp/BUILD.bazel → c++/src/capnp/bak.BUILD.bazel b/c++/src/capnp/BUILD.bazel → c++/src/capnp/bak.BUILD.bazel
diff --git a/c++/src/capnp/compat/BUILD.bazel → c++/src/capnp/compat/bak.BUILD.bazel b/c++/src/capnp/compat/BUILD.bazel → c++/src/capnp/compat/bak.BUILD.bazel
diff --git a/c++/src/kj/BUILD.bazel → c++/src/kj/bak.BUILD.bazel b/c++/src/kj/BUILD.bazel → c++/src/kj/bak.BUILD.bazel
diff --git a/c++/src/kj/string.h b/c++/src/kj/string.h
@@ -95,9 +95,7 @@ class StringPtr {
   inline StringPtr(const char8_t* begin KJ_LIFETIMEBOUND, const char8_t* end KJ_LIFETIMEBOUND)
       : StringPtr(reinterpret_cast<const char*>(begin), reinterpret_cast<const char*>(end)) {}
   // KJ strings are and always have been UTF-8, so screw this C++20 char8_t stuff.
-#endif
-
-#if __cplusplus >= 202000L
+#elif __cplusplus >= 202000L
   inline StringPtr(const char8_t* value): StringPtr(reinterpret_cast<const char*>(value)) {}
   inline StringPtr(const char8_t* value, size_t size)
       : StringPtr(reinterpret_cast<const char*>(value), size) {}