walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix merge conflicts

This commit is contained in:
Daniel Marjamäki 2018-12-01 19:14:43 +01:00
parent b841b818d2
commit ccbaad32f9
1 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/testautovariables.cpp
View File

@ -1510,19 +1510,18 @@ private:
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
<<<<<<< HEAD
<<<<<<< HEAD
check("void f() {\n" check("void f() {\n"
" struct b {\n" " struct b {\n"
" uint32_t f[6];\n" " uint32_t f[6];\n"
" } d;\n" " } d;\n"
" uint32_t *a = d.f;\n" " uint32_t *a = d.f;\n"
======= "}\n");
ASSERT_EQUALS("", errout.str());
// Dont decay std::array // Dont decay std::array
check("std::array<char, 1> f() {\n" check("std::array<char, 1> f() {\n"
" std::array<char, 1> x;\n" " std::array<char, 1> x;\n"
" return x;\n" " return x;\n"
>>>>>>> 52f00b8c88aecaa064f1acbebbe59331f08f09fc
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
@ -1541,7 +1540,7 @@ private:
" A &&a = T{1, 2, 3}[1]();\n" " A &&a = T{1, 2, 3}[1]();\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
=======
// Make sure we dont hang // Make sure we dont hang
check("struct A;\n" check("struct A;\n"
"void f() {\n" "void f() {\n"
@ -1572,7 +1571,6 @@ private:
" }\n" " }\n"
"};\n"); "};\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
>>>>>>> 6586f2d354d3f9dc26d830b6e641f158a5c58432
} }
void danglingLifetimeFunction() { void danglingLifetimeFunction() {