- CMake: added option to turn fail compilation if warning occurs, and warning level 4 with MSVC.

- Fixed some warnings
This commit is contained in:
Baptiste Lepilleur
2013-05-09 18:42:33 +00:00
parent 7b62ceacee
commit 700b38020e
4 changed files with 29 additions and 8 deletions

View File

@@ -1805,7 +1805,7 @@ Path::makePath( const std::string &path,
void
Path::addPathInArg( const std::string &path,
Path::addPathInArg( const std::string &/*path*/,
const InArgs &in,
InArgs::const_iterator &itInArg,
PathArgument::Kind kind )
@@ -1826,8 +1826,8 @@ Path::addPathInArg( const std::string &path,
void
Path::invalidPath( const std::string &path,
int location )
Path::invalidPath( const std::string &/*path*/,
int /*location*/ )
{
// Error: invalid path.
}

View File

@@ -480,10 +480,10 @@ Runner::runCommandLine( int argc, const char *argv[] ) const
}
#if defined(_MSC_VER)
#if defined(_MSC_VER) && defined(_DEBUG)
// Hook MSVCRT assertions to prevent dialog from appearing
static int
msvcrtSilentReportHook( int reportType, char *message, int *returnValue )
msvcrtSilentReportHook( int reportType, char *message, int * /*returnValue*/ )
{
// The default CRT handling of error and assertion is to display
// an error dialog to the user.
@@ -517,9 +517,11 @@ msvcrtSilentReportHook( int reportType, char *message, int *returnValue )
void
Runner::preventDialogOnCrash()
{
#if defined(_MSC_VER)
#if defined(_MSC_VER) && defined(_DEBUG)
// Install a hook to prevent MSVCRT error and assertion from
// popping a dialog.
// popping a dialog
// This function a NO-OP in release configuration
// (which cause warning since msvcrtSilentReportHook is not referenced)
_CrtSetReportHook( &msvcrtSilentReportHook );
#endif // if defined(_MSC_VER)

View File

@@ -193,7 +193,7 @@ namespace JsonTest {
if ( static_cast< U >( expected ) != actual )
{
result.addFailure( file, line, expr );
result << "Expected: " << expected << "\n";
result << "Expected: " << static_cast< U >( expected ) << "\n";
result << "Actual : " << actual;
}
return result;