From 74db76d146fac9082c4c1e671edc18b9cce3edae Mon Sep 17 00:00:00 2001 From: Trammell Hudson Date: Sat, 28 Nov 2015 09:06:30 -0500 Subject: [PATCH] revert sqlite3 changes, update version detection to silence warnings on OSX clang++ 3.0 (issue #480) --- 3rdparty/sqlite3/sqlite3.c | 6 +++--- scripts/genie.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/sqlite3/sqlite3.c b/3rdparty/sqlite3/sqlite3.c index 5dcd842b533..04ab891c633 100644 --- a/3rdparty/sqlite3/sqlite3.c +++ b/3rdparty/sqlite3/sqlite3.c @@ -66815,7 +66815,7 @@ static int vdbeRecordCompareWithSkip( /* RHS is a string */ else if( pRhs->flags & MEM_Str ){ - (void) getVarint32(&aKey1[idx1], serial_type); + getVarint32(&aKey1[idx1], serial_type); testcase( serial_type==12 ); if( serial_type<12 ){ rc = -1; @@ -66846,7 +66846,7 @@ static int vdbeRecordCompareWithSkip( /* RHS is a blob */ else if( pRhs->flags & MEM_Blob ){ - (void) getVarint32(&aKey1[idx1], serial_type); + getVarint32(&aKey1[idx1], serial_type); testcase( serial_type==12 ); if( serial_type<12 || (serial_type & 0x01) ){ rc = -1; @@ -67016,7 +67016,7 @@ static int vdbeRecordCompareString( int serial_type; int res; - (void) getVarint32(&aKey1[1], serial_type); + getVarint32(&aKey1[1], serial_type); if( serial_type<12 ){ res = pPKey2->r1; /* (pKey1/nKey1) is a number or a null */ }else if( !(serial_type & 0x01) ){ diff --git a/scripts/genie.lua b/scripts/genie.lua index 7fd13787389..6ac6933c45f 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -998,7 +998,7 @@ end "-Wno-tautological-compare", "-Wno-dynamic-class-memaccess", } - if (version >= 30200) then + if (version >= 30000) then buildoptions { "-Wno-unused-value", }