diff --git a/src/CBot/CBotDefParam.cpp b/src/CBot/CBotDefParam.cpp index 074f025d..b99503f7 100644 --- a/src/CBot/CBotDefParam.cpp +++ b/src/CBot/CBotDefParam.cpp @@ -223,7 +223,6 @@ bool CBotDefParam::HasDefault() //////////////////////////////////////////////////////////////////////////////// void CBotDefParam::RestoreState(CBotStack* &pj, bool bMain) { - assert(this != nullptr); CBotDefParam* p = this; CBotStack* pile = nullptr; diff --git a/test/unit/CBot/CBot_test.cpp b/test/unit/CBot/CBot_test.cpp index 5d3b72c3..9e264e1e 100644 --- a/test/unit/CBot/CBot_test.cpp +++ b/test/unit/CBot/CBot_test.cpp @@ -216,15 +216,15 @@ protected: if (error != CBotNoErr) { ADD_FAILURE() << "Compile error - " << error << " (" << cursor1 << "-" << (cursor2 >= 0 ? cursor2 : cursor1) << ")" << std::endl << GetFormattedLineInfo(code, cursor1); // TODO: Error messages are on Colobot side - return std::move(program); + return program; } else { ADD_FAILURE() << "No compile error, expected " << expectedCompileError; // TODO: Error messages are on Colobot side - return std::move(program); + return program; } } - if (expectedCompileError != CBotNoErr) return std::move(program); + if (expectedCompileError != CBotNoErr) return program; for (const std::string& test : tests) { @@ -285,7 +285,7 @@ protected: ADD_FAILURE() << ss.str(); } } - return std::move(program); // Take it if you want, destroy on exit otherwise + return program; // Take it if you want, destroy on exit otherwise } };