blob: 6d933b69852946f669beaed38c3fd2d6d5caeea7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
diff --git a/configure ffmpeg/configure
index 732de59292..d2ff68c130 100755
--- a/configure
+++ ffmpeg/configure
@@ -4175,7 +4175,7 @@ mandir_default='${prefix}/share/man'
ar_default="ar"
cc_default="gcc"
stdc_default="c17"
-stdcxx_default="c++11"
+stdcxx_default="c++14"
cxx_default="g++"
host_cc_default="gcc"
doxygen_default="doxygen"
@@ -5743,7 +5743,7 @@ fi
add_cppflags -D_ISOC11_SOURCE
add_cxxflags -D__STDC_CONSTANT_MACROS
check_cxxflags_cc -std=$stdcxx ctype.h "__cplusplus >= 201103L" ||
- { check_cxxflags -std=c++11 && stdcxx="c++11" || { check_cxxflags -std=c++0x && stdcxx="c++0x"; }; }
+ { check_cxxflags -std=c++14 && stdcxx="c++14" || { check_cxxflags -std=c++0x && stdcxx="c++0x"; }; }
# some compilers silently accept -std=c11, so we also need to check that the
# version macro is defined properly
@@ -6892,7 +6892,7 @@ if [ -z "$nvccflags" ]; then
nvccflags=$nvccflags_default
fi
-nvccflags="$nvccflags -std=c++11"
+nvccflags="$nvccflags -std=c++14"
if enabled x86_64 || enabled ppc64 || enabled aarch64; then
nvccflags="$nvccflags -m64"
|