1 files changed, 5 insertions, 0 deletions
diff --git a/clang/Driver/clang.cpp b/clang/Driver/clang.cpp
index bcad4959b4f..ef12eaf2c26 100644
--- a/clang/Driver/clang.cpp
+++ b/clang/Driver/clang.cpp
@@ -452,6 +452,11 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK,
   case lang_c89:
     break;
   }
+
+  if (Options.CPlusPlus) {
+    Options.C99 = 0;
+    Options.HexFloats = (LangStd == lang_gnucxx98 || LangStd==lang_gnucxx0x);
+  }
   
   if (LangStd == lang_c89 || LangStd == lang_c94 || LangStd == lang_gnu89)
     Options.ImplicitInt = 1;