Skip to content

Commit 9033270

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 54418a4 + 0e8f234 commit 9033270

File tree

4 files changed

+800
-45
lines changed

4 files changed

+800
-45
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ source:
231231
--force-directories --recursive --level=15 \
232232
--span-hosts --domains=en.cppreference.com,upload.cppreference.com \
233233
--reject-regex $$regex \
234-
--timeout=180 --no-verbose \
235-
--retry-connrefused --waitretry=1 --read-timeout=20 \
234+
--timeout=5 --tries=50 --no-verbose \
235+
--retry-connrefused --waitretry=10 --read-timeout=20 \
236236
http://en.cppreference.com/w/ ; \
237237
popd > /dev/null
238238

gadgets/coliru_compiler.js

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,38 @@ function Editor(root) {
3232
cc: [
3333
{ title: 'GCC 4.6', cmd: 'g++-4.6 -std=c++98 ' },
3434
{ title: 'GCC 4.7', cmd: 'g++-4.7 -std=c++98 ' },
35-
{ title: 'GCC 4.7 (C++11)', cmd: 'g++-4.7 -std=c++11 ' },
35+
{ title: 'GCC 4.7 (C++11)', cmd: 'g++-4.7 -std=c++11 ', opt_suff: ' -latomic ' },
3636
{ title: 'GCC 4.8', cmd: 'g++-4.8 -std=c++98 ' },
37-
{ title: 'GCC 4.8 (C++11)', cmd: 'g++-4.8 -std=c++11 ' },
37+
{ title: 'GCC 4.8 (C++11)', cmd: 'g++-4.8 -std=c++11 ', opt_suff: ' -latomic ' },
3838
{ title: 'GCC 4.9', cmd: 'g++-4.9 -std=c++98 ' },
39-
{ title: 'GCC 4.9 (C++11)', cmd: 'g++-4.9 -std=c++11 ' },
40-
{ title: 'GCC 4.9 (C++14)', cmd: 'g++-4.9 -std=c++14 ' },
41-
{ title: 'GCC 5.3 (C++98)', cmd: 'g++ -std=c++98 ' },
42-
{ title: 'GCC 5.3 (C++11)', cmd: 'g++ -std=c++11 ' },
43-
{ title: 'GCC 5.3 (C++14)', cmd: 'g++ -std=c++14 ' },
44-
{ title: 'GCC 5.3 (C++17)', cmd: 'g++ -std=c++1z ' },
45-
{ title: 'clang 3.7', cmd: 'clang++ -std=c++98 ' },
46-
{ title: 'clang 3.7 (C++11)',
39+
{ title: 'GCC 4.9 (C++11)', cmd: 'g++-4.9 -std=c++11 ', opt_suff: ' -latomic ' },
40+
{ title: 'GCC 4.9 (C++14)', cmd: 'g++-4.9 -std=c++14 ', opt_suff: ' -latomic ' },
41+
{ title: 'GCC 5.2 (C++98)', cmd: 'g++-5.2 -std=c++98 ' },
42+
{ title: 'GCC 5.2 (C++11)', cmd: 'g++-5.2 -std=c++11 ', opt_suff: ' -latomic ' },
43+
{ title: 'GCC 5.2 (C++14)', cmd: 'g++-5.2 -std=c++14 ', opt_suff: ' -latomic ' },
44+
{ title: 'GCC 5.2 (C++17)', cmd: 'g++-5.2 -std=c++1z ', opt_suff: ' -latomic ' },
45+
{ title: 'GCC 6.1 (C++98)', cmd: 'g++ -std=c++98 ' },
46+
{ title: 'GCC 6.1 (C++11)', cmd: 'g++ -std=c++11 ', opt_suff: ' -latomic ' },
47+
{ title: 'GCC 6.1 (C++14)', cmd: 'g++ -std=c++14 ', opt_suff: ' -latomic ' },
48+
{ title: 'GCC 6.1 (C++17)', cmd: 'g++ -std=c++1z ', opt_suff: ' -latomic ' },
49+
{ title: 'GCC 6.1 (C++17 + Concepts TS + TM TS + Filesystem TS)',
50+
cmd: 'g++ -std=c++1z -fconcepts -fgnu-tm ',
51+
opt_suff: ' -latomic -lstdc++fs ' },
52+
{ title: 'clang 3.8', cmd: 'clang++ -std=c++98 ' },
53+
{ title: 'clang 3.8 (C++11)',
4754
cmd: 'clang++ -std=c++11 -stdlib=libc++ ',
48-
opt_suff: ' -lsupc++ '
55+
opt_suff: ' -latomic -lsupc++ '
4956
},
50-
{ title: 'clang 3.7 (C++14)',
57+
{ title: 'clang 3.8 (C++14)',
5158
cmd: 'clang++ -std=c++14 -stdlib=libc++ ',
52-
opt_suff: ' -lsupc++ '
59+
opt_suff: ' -latomic -lsupc++ '
5360
},
54-
{ title: 'clang 3.7 (C++17)',
61+
{ title: 'clang 3.8 (C++17)',
5562
cmd: 'clang++ -std=c++1z -stdlib=libc++ ',
56-
opt_suff: ' -lsupc++ '
63+
opt_suff: ' -latomic -lsupc++ '
5764
}
5865
],
59-
default_id: 10,
66+
default_id: 16,
6067
opt: ' -O2 -Wall -Wextra -pedantic -pthread -pedantic-errors main.cpp -lm ',
6168
}
6269

@@ -68,15 +75,18 @@ function Editor(root) {
6875
{ title: 'GCC 4.8 (C99)', cmd: 'g++-4.8 -x c -std=c99 ' },
6976
{ title: 'GCC 4.9', cmd: 'gcc-4.9 -x c -std=c89 ' },
7077
{ title: 'GCC 4.9 (C99)', cmd: 'g++-4.9 -x c -std=c99 ' },
71-
{ title: 'GCC 4.9 (C11)', cmd: 'g++-4.9 -x c -std=c11 ' },
72-
{ title: 'GCC 5.3 (C89)', cmd: 'g++ -x c -std=c89 ' },
73-
{ title: 'GCC 5.3 (C99)', cmd: 'g++ -x c -std=c99 ' },
74-
{ title: 'GCC 5.3 (C11)', cmd: 'g++ -x c -std=c11 ' },
75-
{ title: 'clang 3.7', cmd: 'clang -x c -std=c89 -Wno-newline-eof ' },
76-
{ title: 'clang 3.7 (C99)', cmd: 'clang++ -x c -std=c99 -Wno-newline-eof '},
77-
{ title: 'clang 3.7 (C11)', cmd: 'clang++ -x c -std=c11 -Wno-newline-eof '}
78+
{ title: 'GCC 4.9 (C11)', cmd: 'g++-4.9 -x c -std=c11 ', opt_suff: ' -latomic ' },
79+
{ title: 'GCC 5.2 (C89)', cmd: 'g++-5.2 -x c -std=c89 ' },
80+
{ title: 'GCC 5.2 (C99)', cmd: 'g++-5.2 -x c -std=c99 ' },
81+
{ title: 'GCC 5.2 (C11)', cmd: 'g++-5.2 -x c -std=c11 ', opt_suff: ' -latomic ' },
82+
{ title: 'GCC 6.1 (C89)', cmd: 'g++ -x c -std=c89 ' },
83+
{ title: 'GCC 6.1 (C99)', cmd: 'g++ -x c -std=c99 ' },
84+
{ title: 'GCC 6.1 (C11)', cmd: 'g++ -x c -std=c11 ', opt_suff: ' -latomic ' },
85+
{ title: 'clang 3.8', cmd: 'clang -x c -std=c89 -Wno-newline-eof ' },
86+
{ title: 'clang 3.8 (C99)', cmd: 'clang++ -x c -std=c99 -Wno-newline-eof '},
87+
{ title: 'clang 3.8 (C11)', cmd: 'clang++ -x c -std=c11 -Wno-newline-eof ', opt_suff: ' -latomic '}
7888
],
79-
default_id: 9,
89+
default_id: 12,
8090
opt: ' -O2 -Wall -Wextra -pedantic -pthread -pedantic-errors main.cpp -lm ',
8191
}
8292

index-cpp-search-app.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,3 +263,5 @@ using (type alias, alias template) => cpp/language/type_alias
263263
ODR => cpp/language/definition#One_Definition_Rule
264264
odr-use => cpp/language/definition#One_Definition_Rule
265265
__has_include => cpp/preprocessor/include
266+
final => cpp/language/final
267+
override => cpp/language/override

0 commit comments

Comments
 (0)