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

Fixed VS warnings

This commit is contained in:
PKEuS 2014-06-04 18:55:29 +02:00
parent 2455b76abd
commit 51f381edf3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/library.h
View File

@ -50,7 +50,7 @@ public:
class Error { class Error {
public: public:
Error() : errorcode(ErrorCode::OK) , reason("") {} Error() : errorcode(OK) , reason("") {}
explicit Error(ErrorCode e) : errorcode(e) , reason("") {} explicit Error(ErrorCode e) : errorcode(e) , reason("") {}
Error(ErrorCode e, const std::string &r) : errorcode(e), reason(r) {} Error(ErrorCode e, const std::string &r) : errorcode(e), reason(r) {}
ErrorCode errorcode; ErrorCode errorcode;

2
test/testsimplifytokens.cpp
View File

@ -493,7 +493,7 @@ private:
errout.str(""); errout.str("");
Settings settings; Settings settings;
if ((settings.library.load("./testrunner", "../cfg/std.cfg").errorcode != Library::ErrorCode::OK) && (settings.library.load("./testrunner", "cfg/std.cfg").errorcode != Library::ErrorCode::OK)) { if ((settings.library.load("./testrunner", "../cfg/std.cfg").errorcode != Library::OK) && (settings.library.load("./testrunner", "cfg/std.cfg").errorcode != Library::OK)) {
complainMissingLib("std.cfg"); complainMissingLib("std.cfg");
return ""; return "";
} }

4
test/testsuite.h
View File

@ -85,9 +85,9 @@ public:
#define REGISTER_TEST( CLASSNAME ) namespace { CLASSNAME instance; } #define REGISTER_TEST( CLASSNAME ) namespace { CLASSNAME instance; }
#ifdef _WIN32 #ifdef _WIN32
#define LOAD_LIB_2( LIB, NAME ) { if (((LIB).load("./testrunner", "../cfg/" NAME).errorcode != Library::ErrorCode::OK) && ((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::ErrorCode::OK)) { complainMissingLib(NAME); return; } } #define LOAD_LIB_2( LIB, NAME ) { if (((LIB).load("./testrunner", "../cfg/" NAME).errorcode != Library::OK) && ((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::OK)) { complainMissingLib(NAME); return; } }
#else #else
#define LOAD_LIB_2( LIB, NAME ) { if ((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::ErrorCode::OK) { complainMissingLib(NAME); return; } } #define LOAD_LIB_2( LIB, NAME ) { if ((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::OK) { complainMissingLib(NAME); return; } }
#endif #endif
#define LOAD_LIB( NAME ) { LOAD_LIB_2(_lib, NAME); } #define LOAD_LIB( NAME ) { LOAD_LIB_2(_lib, NAME); }