From b3eb64b0f774130833e6b5f8c18cd61403f420f3 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sun, 15 Oct 2023 07:53:08 -0700
Subject: [PATCH] [wpiutil] ct_string: Use inline namespace for literals
 (#5767)

This avoids a conflict with json.
---
 wpiutil/src/main/native/include/wpi/ct_string.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wpiutil/src/main/native/include/wpi/ct_string.h b/wpiutil/src/main/native/include/wpi/ct_string.h
index 3bf870d37a..9f0ef90750 100644
--- a/wpiutil/src/main/native/include/wpi/ct_string.h
+++ b/wpiutil/src/main/native/include/wpi/ct_string.h
@@ -80,7 +80,7 @@ struct ct_string {
 template <typename Char, size_t M>
 ct_string(Char const (&s)[M]) -> ct_string<Char, std::char_traits<Char>, M - 1>;
 
-namespace literals {
+inline namespace literals {
 template <ct_string S>
 consteval auto operator""_ct_string() {
   return S;