Skip to content

Commit 3c32946

Browse files
sean-mcmanussean-mcmanus
authored
Merge branch 'main' into insiders
2 parents 41b7678 + 1145a49 commit 3c32946

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1077
-642
lines changed

‎.github/actions/package-lock.json‎

Lines changed: 7 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/actions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"@actions/core": "^1.2.6",
1414
"@actions/github": "^2.1.1",
15-
"axios": "^0.19.2"
15+
"axios": "^0.21.1"
1616
},
1717
"devDependencies": {
1818
"eslint": "^6.8.0",

‎Extension/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Fix #include completion not sorting _ last. [#3465](https://github.com/microsoft/vscode-cpptools/issues/3465)
1212
* Fix crash when certain JavaScript files are parsed as C++. [#3858](https://github.com/microsoft/vscode-cpptools/issues/3858)
1313
* Fix IntelliSense squiggle about not being able to assign to an object of its own type. [#3883](https://github.com/microsoft/vscode-cpptools/issues/3883)
14-
* Fix hover and Find All References for template function overloads. [#4044[(https://github.com/microsoft/vscode-cpptools/issues/4044), [#4249](https://github.com/microsoft/vscode-cpptools/issues/4249)
14+
* Fix hover and Find All References for template function overloads. [#4044](https://github.com/microsoft/vscode-cpptools/issues/4044), [#4249](https://github.com/microsoft/vscode-cpptools/issues/4249)
1515
* Fix the Outline view for nested namespaces. [#4456](https://github.com/microsoft/vscode-cpptools/issues/4456)
1616
* Fix Outline view with`"**/.*"` in `files.exclude`. [#4602](https://github.com/microsoft/vscode-cpptools/issues/4602)
1717
* Fix the Outline view for nested structs/classes. [#4781](https://github.com/microsoft/vscode-cpptools/issues/4871)

‎Extension/bin/common.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"defaults": [
3+
"cpfe",
4+
"--wchar_t_keyword",
5+
"--no_warnings",
6+
"--rtti",
7+
"--edge",
8+
"--exceptions",
9+
"--error_limit",
10+
"25000",
11+
"-D_EDG_COMPILER",
12+
"-D_USE_DECLSPECS_FOR_SAL=1"
13+
],
14+
"source_file_format": "-f %s",
15+
"expressions": [
16+
{
17+
"match": "^/I(.*)",
18+
"replace": "-I\n$1"
19+
},
20+
{
21+
"match": "^/D(.*)",
22+
"replace": "-D$1"
23+
},
24+
{
25+
"match": "^/AI(.*)",
26+
"replace": "--using_directory\n$1"
27+
},
28+
{
29+
"match": "^/dE--header_only_fallback",
30+
"replace": "--header_only_fallback"
31+
}
32+
]
33+
}

‎Extension/bin/linux.clang.arm.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"defaults": [
3+
"--pack_alignment",
4+
"8",
5+
"-Dunix=1",
6+
"-D__unix__=1",
7+
"-D__linux__=1",
8+
"-D__arm__=1",
9+
"-D__ARM_32BIT_STATE=1",
10+
"-D__PTRDIFF_TYPE__=int",
11+
"-D__SIZE_TYPE__=unsigned int",
12+
"-D__WCHAR_TYPE__=long int"
13+
],
14+
"defaults_op" : "merge"
15+
}

‎Extension/bin/linux.clang.arm64.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"defaults": [
3+
"--pack_alignment",
4+
"8",
5+
"-Dunix=1",
6+
"-D__unix__=1",
7+
"-D__linux__=1",
8+
"-D__aarch64__=1",
9+
"-D__ARM_64BIT_STATE=1",
10+
"-D__PTRDIFF_TYPE__=long int",
11+
"-D__SIZE_TYPE__=long unsigned int",
12+
"-D__WCHAR_TYPE__=int"
13+
],
14+
"defaults_op" : "merge"
15+
}

‎Extension/bin/linux.clang.x64.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"defaults": [
3+
"--pack_alignment",
4+
"8",
5+
"-Dunix=1",
6+
"-D__unix__=1",
7+
"-D__linux__=1",
8+
"-D__x86_64=1",
9+
"-D__x86_64__=1",
10+
"-D__PTRDIFF_TYPE__=long int",
11+
"-D__SIZE_TYPE__=long unsigned int",
12+
"-D__WCHAR_TYPE__=int"
13+
],
14+
"defaults_op" : "merge"
15+
}

‎Extension/bin/linux.clang.x86.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"defaults": [
3+
"--pack_alignment",
4+
"8",
5+
"-Dunix=1",
6+
"-D__unix__=1",
7+
"-D__linux__=1",
8+
"-D__i386=1",
9+
"-D__i386__=1",
10+
"-D__PTRDIFF_TYPE__=int",
11+
"-D__SIZE_TYPE__=unsigned int",
12+
"-D__WCHAR_TYPE__=long int"
13+
],
14+
"defaults_op" : "merge"
15+
}

‎Extension/bin/linux.gcc.arm.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"defaults": [
3+
"--pack_alignment",
4+
"8",
5+
"-Dunix=1",
6+
"-D__unix__=1",
7+
"-D__linux__=1",
8+
"-D__arm__=1",
9+
"-D__ARM_32BIT_STATE=1",
10+
"-D__PTRDIFF_TYPE__=int",
11+
"-D__SIZE_TYPE__=unsigned int",
12+
"-D__WCHAR_TYPE__=long int"
13+
],
14+
"defaults_op" : "merge"
15+
}

‎Extension/bin/linux.gcc.arm64.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"defaults": [
3+
"--pack_alignment",
4+
"8",
5+
"-Dunix=1",
6+
"-D__unix__=1",
7+
"-D__linux__=1",
8+
"-D__aarch64__=1",
9+
"-D__ARM_64BIT_STATE=1",
10+
"-D__PTRDIFF_TYPE__=long int",
11+
"-D__SIZE_TYPE__=long unsigned int",
12+
"-D__WCHAR_TYPE__=int"
13+
],
14+
"defaults_op" : "merge"
15+
}

0 commit comments

Comments
 (0)