Skip to content

Commit a6bb63f

Browse files
committed
Merge branch 'main' into rust-ti-implementing-type-method
2 parents 3f4bf76 + bab84d0 commit a6bb63f

File tree

41 files changed

+112
-147
lines changed

Some content is hidden

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

41 files changed

+112
-147
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "a.h"
2+
#define FOUR 4
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
int main() {
2+
return ONE + FOUR;
3+
}

cpp/ql/test/header-variant-tests/clang-pch/clang-pch.expected renamed to cpp/ql/integration-tests/header-variant-tests/clang-pch/clang-pch.expected

File renamed without changes.

cpp/ql/test/header-variant-tests/clang-pch/clang-pch.ql renamed to cpp/ql/integration-tests/header-variant-tests/clang-pch/clang-pch.ql

File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#import "d.h"
File renamed without changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
int main() {
2+
return SEVENTEEN;
3+
}

0 commit comments

Comments
 (0)