From 28f737a15d9ce5d9e8b06ab768ef858c07ae510e Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 5 Sep 2023 15:20:13 +0300
Subject: Make c++11 value default for xsd --std option

Also add support for c++14, c++17, c++20, and c++23 values and drop passing
--std option in tests and examples.
---
 xsd/doc/cxx/parser/guide/index.xhtml.in | 19 +++++++++----------
 xsd/doc/cxx/tree/guide/index.xhtml.in   | 14 ++++++--------
 2 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'xsd/doc/cxx')

diff --git a/xsd/doc/cxx/parser/guide/index.xhtml.in b/xsd/doc/cxx/parser/guide/index.xhtml.in
index 96d06e2..119f421 100644
--- a/xsd/doc/cxx/parser/guide/index.xhtml.in
+++ b/xsd/doc/cxx/parser/guide/index.xhtml.in
@@ -553,7 +553,7 @@
   </p>
 
   <pre class="terminal">
-$ xsd cxx-parser --std c++11 --xml-parser expat hello.xsd
+$ xsd cxx-parser --xml-parser expat hello.xsd
   </pre>
 
   <p>The <code>--xml-parser</code> option indicates that we want to
@@ -1494,7 +1494,7 @@ gender ::gender ::gender;
      option to let the XSD compiler know about our type map:</p>
 
   <pre class="terminal">
-$ xsd cxx-parser --std c++11 --type-map people.map people.xsd
+$ xsd cxx-parser --type-map people.map people.xsd
   </pre>
 
   <p>If we now look at the generated <code>people-pskel.hxx</code>,
@@ -1673,10 +1673,10 @@ namespace http://www.w3.org/2001/XMLSchema
 
   QName xml_schema::qname;
 
-  base64Binary std::[auto|unique]_ptr&lt;xml_schema::buffer>
-               std::[auto|unique]_ptr&lt;xml_schema::buffer>;
-  hexBinary std::[auto|unique]_ptr&lt;xml_schema::buffer>
-            std::[auto|unique]_ptr&lt;xml_schema::buffer>;
+  base64Binary std::[unique|auto]_ptr&lt;xml_schema::buffer>
+               std::[unique|auto]_ptr&lt;xml_schema::buffer>;
+  hexBinary std::[unique|auto]_ptr&lt;xml_schema::buffer>
+            std::[unique|auto]_ptr&lt;xml_schema::buffer>;
 
   date xml_schema::date;
   dateTime xml_schema::date_time;
@@ -1742,8 +1742,7 @@ people ::people;
      recompile our schema and move on to implementing the parsers:</p>
 
   <pre class="terminal">
-$ xsd cxx-parser --std c++11 --xml-parser expat --type-map people.map \
-      people.xsd
+$ xsd cxx-parser --xml-parser expat --type-map people.map people.xsd
   </pre>
 
   <p>Here is the implementation of our three parsers in full. One
@@ -2608,14 +2607,14 @@ private:
     <tr>
       <td><code>base64Binary</code></td>
       <td><code>base64_binary_pimpl</code></td>
-      <td><code>std::[auto|unique]_ptr&lt; xml_schema::buffer></code><br/>
+      <td><code>std::[unique|auto]_ptr&lt; xml_schema::buffer></code><br/>
           <a href="#6.3">Section 6.3, "<code>base64Binary</code> and
           <code>hexBinary</code> Parsers"</a></td>
     </tr>
     <tr>
       <td><code>hexBinary</code></td>
       <td><code>hex_binary_pimpl</code></td>
-      <td><code>std::[auto|unique]_ptr&lt; xml_schema::buffer></code><br/>
+      <td><code>std::[unique|auto]_ptr&lt; xml_schema::buffer></code><br/>
           <a href="#6.3">Section 6.3, "<code>base64Binary</code> and
           <code>hexBinary</code> Parsers"</a></td>
     </tr>
diff --git a/xsd/doc/cxx/tree/guide/index.xhtml.in b/xsd/doc/cxx/tree/guide/index.xhtml.in
index b704e50..2f7f1e2 100644
--- a/xsd/doc/cxx/tree/guide/index.xhtml.in
+++ b/xsd/doc/cxx/tree/guide/index.xhtml.in
@@ -536,7 +536,7 @@
   </p>
 
   <pre class="terminal">
-$ xsd cxx-tree --std c++11 hello.xsd
+$ xsd cxx-tree hello.xsd
   </pre>
 
   <p>The XSD compiler produces two C++ files: <code>hello.hxx</code> and
@@ -633,7 +633,7 @@ hello (std::istream&amp;);
      select C++98:</p>
 
   <pre class="terminal">
-$ xsd cxx-tree hello.xsd
+$ xsd cxx-tree --std c++98 hello.xsd
   </pre>
 
   <p>Then the parsing function signatures will become:</p>
@@ -726,7 +726,7 @@ Hello, world!
      it with the <code>--generate-serialization</code> options:</p>
 
   <pre class="terminal">
-$ xsd cxx-tree --std c++11 --generate-serialization hello.xsd
+$ xsd cxx-tree --generate-serialization hello.xsd
   </pre>
 
   <p>If we now examine the generated <code>hello.hxx</code> file,
@@ -911,7 +911,7 @@ main (int argc, char* argv[])
      change the type naming scheme:</p>
 
   <pre class="terminal">
-$ xsd cxx-tree --std c++11 --type-naming ucc hello.xsd
+$ xsd cxx-tree --type-naming ucc hello.xsd
   </pre>
 
   <p>The <code>ucc</code> argument to the <code>--type-naming</code>
@@ -978,8 +978,7 @@ hello (std::istream&amp;);
      <code>--type-regex</code> option:</p>
 
   <pre class="terminal">
-$ xsd cxx-tree --std c++11 --type-naming ucc \
-      --type-regex '/ (.+)_t/\u$1/' hello.xsd
+$ xsd cxx-tree --type-naming ucc --type-regex '/ (.+)_t/\u$1/' hello.xsd
   </pre>
 
   <p>This results in the following changes to the generated code:</p>
@@ -1114,8 +1113,7 @@ hello (std::istream&amp;);
      our schema with the <code>--generate-doxygen</code> option:</p>
 
   <pre class="terminal">
-$ xsd cxx-tree --std c++11 --generate-serialization --generate-doxygen \
-      hello.xsd
+$ xsd cxx-tree --generate-serialization --generate-doxygen hello.xsd
   </pre>
 
   <p>Now the generated <code>hello.hxx</code> file contains comments
-- 
cgit v1.1