Merge pull request #4300 from PoeticPete/cpp20-strings

Add C++20 support by updating strings
uncrustify · May 24, 2024 · c17d7b7 · c17d7b7
2 parents ee3c62f + 50d234f
commit c17d7b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/make_options.py b/scripts/make_options.py
@@ -49,7 +49,7 @@ def __init__(self, name, dval, decl, desc):
     def write_declaration(self, out):
         out.write(u'{} {} = {{\n'.format(self.decl, self.name))
         out.write(u'  "{}",\n'.format(self.name))
-        out.write(u'  u8R"__(\n{}\n)__"'.format(self.desc))
+        out.write(u'  R"__(\n{}\n)__"'.format(self.desc))
         if self.dval is not None:
             out.write(u',\n  {}'.format(self.dval))
         out.write(u'\n};\n\n')
@@ -90,7 +90,7 @@ def write_declarations(out, args):
 # -----------------------------------------------------------------------------
 def write_registrations(out, args):
     for group in groups:
-        out.write(u'\n  begin_option_group(u8R"__(\n{}\n)__");\n\n'.format(
+        out.write(u'\n  begin_option_group(R"__(\n{}\n)__");\n\n'.format(
             group.desc))
 
         for option in group.options:

diff --git a/src/option.cpp b/src/option.cpp
@@ -28,7 +28,7 @@ namespace uncrustify
 namespace
 {
 
-static const char *DOC_TEXT_END = u8R"___(
+static const char *DOC_TEXT_END = R"___(
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc