Skip to content

Commit dd5b55a

Browse files
committed
Fix errors in pedantic mode
Fixes #127.
1 parent 767499e commit dd5b55a

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

hdr/sqlite_modern_cpp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ namespace sqlite {
374374
};
375375
inline OpenFlags operator|(const OpenFlags& a, const OpenFlags& b) {
376376
return static_cast<OpenFlags>(static_cast<int>(a) | static_cast<int>(b));
377-
};
377+
}
378378
enum class Encoding {
379379
ANY = SQLITE_ANY,
380380
UTF8 = SQLITE_UTF8,
@@ -958,7 +958,7 @@ namespace sqlite {
958958
Values&&... values
959959
) {
960960
static_cast<Functions*>(sqlite3_user_data(db))->first(std::forward<Values>(values)...);
961-
};
961+
}
962962

963963
template<
964964
typename ContextType,

hdr/sqlite_modern_cpp/lists/error_codes.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#if SQLITE_VERSION_NUMBER < 3010000
2+
#define SQLITE_IOERR_VNODE (SQLITE_IOERR | (27<<8))
3+
#define SQLITE_IOERR_AUTH (SQLITE_IOERR | (28<<8))
4+
#define SQLITE_AUTH_USER (SQLITE_AUTH | (1<<8))
5+
#endif
16
SQLITE_MODERN_CPP_ERROR_CODE(ERROR,error,)
27
SQLITE_MODERN_CPP_ERROR_CODE(INTERNAL,internal,)
38
SQLITE_MODERN_CPP_ERROR_CODE(PERM,perm,)
@@ -41,12 +46,8 @@ SQLITE_MODERN_CPP_ERROR_CODE(IOERR,ioerr,
4146
SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,MMAP,ioerr,mmap)
4247
SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,GETTEMPPATH,ioerr,gettemppath)
4348
SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,CONVPATH,ioerr,convpath)
44-
#if SQLITE_VERSION_NUMBER >= 3009000
4549
SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,VNODE,ioerr,vnode)
46-
#endif
47-
#if SQLITE_VERSION_NUMBER >= 3010000
4850
SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,AUTH,ioerr,auth)
49-
#endif
5051
)
5152
SQLITE_MODERN_CPP_ERROR_CODE(CORRUPT,corrupt,
5253
SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(CORRUPT,VTAB,corrupt,vtab)
@@ -79,9 +80,6 @@ SQLITE_MODERN_CPP_ERROR_CODE(MISMATCH,mismatch,)
7980
SQLITE_MODERN_CPP_ERROR_CODE(MISUSE,misuse,)
8081
SQLITE_MODERN_CPP_ERROR_CODE(NOLFS,nolfs,)
8182
SQLITE_MODERN_CPP_ERROR_CODE(AUTH,auth,
82-
#if SQLITE_VERSION_NUMBER >= 3009000
83-
SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(AUTH,USER,auth,user)
84-
#endif
8583
)
8684
SQLITE_MODERN_CPP_ERROR_CODE(FORMAT,format,)
8785
SQLITE_MODERN_CPP_ERROR_CODE(RANGE,range,)

0 commit comments

Comments
 (0)