Add c++17 mode (--std c++17), also translate to c++NN rather than gnu++NN

1 files changed, 8 insertions, 3 deletions

diff --git a/odb/odb.cxx b/odb/odb.cxx
index f5dcd42..a10d1d2 100644
--- a/odb/odb.cxx
+++ b/odb/odb.cxx
@@ -646,17 +646,22 @@ main (int argc, char* argv[])
       {
       case cxx_version::cxx98:
         {
-          args[3] = "-std=gnu++98";
+          args[3] = "-std=c++98";
           break;
         }
       case cxx_version::cxx11:
         {
-          args[3] = "-std=gnu++0x"; // gnu++11 was only added in GCC 4.7.0.
+          args[3] = "-std=c++0x"; // c++11 was only added in GCC 4.7.0.
           break;
         }
       case cxx_version::cxx14:
         {
-          args[3] = "-std=gnu++14";
+          args[3] = "-std=c++1y";
+          break;
+        }
+      case cxx_version::cxx17:
+        {
+          args[3] = "-std=c++1z";
           break;
         }
       }