From b062bf5eeeecae87c081319ebf7a2c03510b5a34 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 29 Oct 2017 16:36:15 -0500 Subject: [PATCH] Add default 'iso' value for 'cxxstd-dialect'. Need a real default value instead of just optional for 'cxstd-dialect' so that it can be use in command line for multi-variant build requests. --- src/tools/features/cxxstd-feature.jam | 9 +++++---- src/tools/gcc.jam | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tools/features/cxxstd-feature.jam b/src/tools/features/cxxstd-feature.jam index 20bd0028b..04d4061a4 100644 --- a/src/tools/features/cxxstd-feature.jam +++ b/src/tools/features/cxxstd-feature.jam @@ -26,9 +26,10 @@ feature.feature cxxstd # The cxxstd:dialet subfeature indicates if a non-standard dialect should be # used. These usually have either/or extensions or platform specific -# functionality. Not specifying the dialect will disable any dialect and use -# ANSI C++ Standard conformance. +# functionality. Not specifying the dialect will default to 'iso'. Which will +# attempt to use ISO C++ Standard conformance to the best of the compiler's +# ability. feature.subfeature cxxstd : dialect - : gnu ms - : optional composite propagated ; + : iso gnu ms + : composite propagated ; diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam index 766d9dee0..234158f28 100644 --- a/src/tools/gcc.jam +++ b/src/tools/gcc.jam @@ -450,7 +450,7 @@ rule set-cxxstd-options ( targets * : sources * : properties * : action ) switch [ feature.get-values cxxstd-dialect : $(properties) ] { case gnu : cxxstd-dialect = gnu++ ; - case * : cxxstd-dialect = c++ ; + case ansi : cxxstd-dialect = c++ ; } local option ; if $(cxxstd) = latest