Skip to content

Commit f43662a

Browse files
committed
Merge remote-tracking branch 'origin/jsinglet/concurrency3' into jsinglet/concurrency3
2 parents 5d86cd8 + e3a192d commit f43662a

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

cpp/common/test/rules/donotallowamutextogooutofscopewhilelocked/test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void join_threads(std::thread *threads) {
131131

132132
void f11() {
133133
std::thread threads[5];
134-
std::mutex m1; // NON_COMPLIANT (FALSE POSITIVE)
134+
std::mutex m1; // COMPLIANT[FALSE_POSITIVE]
135135

136136
for (int i = 0; i < 5; ++i) {
137137
threads[i] = std::thread(t1, i, &m1);

scripts/bump_version.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env bash
2+
3+
4+
if [[ -z $1 ]];
5+
then
6+
echo "Usage: bump_version.sh <new_version>"
7+
exit
8+
fi
9+
10+
echo "Setting Local Branch Version to $1."
11+
12+
find . -name 'qlpack.yml' | grep -v './codeql_modules' | grep -v './scripts' | xargs sed -i "s/^version.*$/version: ${1}/"
13+
14+
echo "Done."

0 commit comments

Comments
 (0)