diff --git a/AMBuildScript b/AMBuildScript
index 5745de2..80e31fb 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -140,11 +140,12 @@ class ExtensionConfig(object):
       '-fvisibility=hidden',
     ]
     cxx.cxxflags += [
-      '-std=c++14',
+      '-std=c++17',
       '-fno-exceptions',
       '-fno-threadsafe-statics',
       '-Wno-non-virtual-dtor',
       '-Wno-overloaded-virtual',
+      '-Wno-register',
       '-fvisibility-inlines-hidden',
     ]
     cxx.linkflags += ['-m32']
@@ -205,6 +206,7 @@ class ExtensionConfig(object):
       '/EHsc',
       '/GR-',
       '/TP',
+      '/std:c++17',
     ]
     cxx.linkflags += [
       '/MACHINE:X86',