Skip to content

Commit 1144743

Browse files
committed
Merge pull request p12tic#29 from cubbimew/master
correct clang version, add C11, add clang c++14
2 parents 6c26a86 + 70f80a7 commit 1144743

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

gadgets/coliru_compiler.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,14 @@ function Editor(root) {
3838
{ title: 'GCC 4.9', cmd: 'g++-4.9 -std=c++98 ' },
3939
{ title: 'GCC 4.9 (C++11)', cmd: 'g++-4.9 -std=c++11 ' },
4040
{ title: 'GCC 4.9 (C++14)', cmd: 'g++-4.9 -std=c++14 ' },
41-
{ title: 'clang 3.4', cmd: 'clang++ -std=c++98 ' },
42-
{ title: 'clang 3.4 (C++11)',
41+
{ title: 'clang 3.5', cmd: 'clang++ -std=c++98 ' },
42+
{ title: 'clang 3.5 (C++11)',
4343
cmd: 'clang++ -std=c++11 -stdlib=libc++ ',
4444
opt_suff: ' -lsupc++ '
45+
},
46+
{ title: 'clang 3.5 (C++14)',
47+
cmd: 'clang++ -std=c++14 -stdlib=libc++ ',
48+
opt_suff: ' -lsupc++ '
4549
}
4650
],
4751
default_id: 7,
@@ -56,10 +60,12 @@ function Editor(root) {
5660
{ title: 'GCC 4.8 (C99)', cmd: 'g++-4.8 -x c -std=c99 ' },
5761
{ title: 'GCC 4.9', cmd: 'gcc-4.9 -x c -std=c89 ' },
5862
{ title: 'GCC 4.9 (C99)', cmd: 'g++-4.9 -x c -std=c99 ' },
59-
{ title: 'clang 3.4', cmd: 'clang -x c -std=c89 -Wno-newline-eof ' },
60-
{ title: 'clang 3.4 (C99)', cmd: 'clang++ -x c -std=c99 -Wno-newline-eof '}
63+
{ title: 'GCC 4.9 (C11)', cmd: 'g++-4.9 -x c -std=c11 ' },
64+
{ title: 'clang 3.5', cmd: 'clang -x c -std=c89 -Wno-newline-eof ' },
65+
{ title: 'clang 3.5 (C99)', cmd: 'clang++ -x c -std=c99 -Wno-newline-eof '},
66+
{ title: 'clang 3.5 (C11)', cmd: 'clang++ -x c -std=c11 -Wno-newline-eof '}
6167
],
62-
default_id: 3,
68+
default_id: 6,
6369
opt: ' -O2 -Wall -Wextra -pedantic -pthread -pedantic-errors main.cpp -lm ',
6470
}
6571

@@ -70,7 +76,7 @@ function Editor(root) {
7076
'cxx14' : { c: 'cxx', id: 7 },
7177
'c89' : { c: 'cc', id: 4 },
7278
'c99' : { c: 'cc', id: 5 },
73-
'c11' : { c: 'cc', id: 5 }
79+
'c11' : { c: 'cc', id: 6 }
7480
}
7581

7682
this.get_std_id = function() {

0 commit comments

Comments
 (0)