cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-09 12:16:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #413 Fix compiler warnings warning from ninjaoflight/fix-visibility-warning

Browse Source
This commit is contained in:
Sébastien Rombauts 2023-05-15 14:23:45 +02:00 committed by GitHub
commit 5e6ef45426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SQLiteCpp/SQLiteCppExport.h
View File

@ -21,10 +21,8 @@
#if defined(_WIN32)&& !defined(__GNUC__) && defined(SQLITECPP_COMPILE_DLL)
#if SQLITECPP_DLL_EXPORT
#define SQLITECPP_API __declspec(dllexport)
#pragma message("Exporting symbols")
#else
#define SQLITECPP_API __declspec(dllimport)
#pragma message("Importing symbols")
#endif
#else
#if __GNUC__ >= 4

8
meson.build
View File

@ -148,8 +148,14 @@ if get_option('SQLITECPP_USE_STACK_PROTECTION')
message('warning: SQLiteCpp does not support stack protection on MinGW-W64')
message('warning: this could lead to a crash on the application')
message('warning: you can disable this warning by setting SQLITECPP_USE_STACK_PROTECTOR to false')
else
## check if it is supported by the compiler
elif cxx.has_argument('-fstack-protector')
sqlitecpp_args += ['-fstack-protector']
## if not supported give a warning
else
message('warning: SQLiteCpp does not have stack protection support in this compiler')
message('warning: this argument will be ignored')
message('warning: you can disable this warning by setting SQLITECPP_USE_STACK_PROTECTOR to false')
endif
endif

10
src/Column.cpp
View File

@ -18,11 +18,11 @@
namespace SQLite
{
SQLITECPP_API const int INTEGER = SQLITE_INTEGER;
SQLITECPP_API const int FLOAT = SQLITE_FLOAT;
SQLITECPP_API const int TEXT = SQLITE_TEXT;
SQLITECPP_API const int BLOB = SQLITE_BLOB;
SQLITECPP_API const int Null = SQLITE_NULL;
const int INTEGER = SQLITE_INTEGER;
const int FLOAT = SQLITE_FLOAT;
const int TEXT = SQLITE_TEXT;
const int BLOB = SQLITE_BLOB;
const int Null = SQLITE_NULL;
// Encapsulation of a Column in a row of the result pointed by the prepared Statement.

28
src/Database.cpp
View File

@ -26,25 +26,25 @@
namespace SQLite
{
SQLITECPP_API const int OK = SQLITE_OK;
SQLITECPP_API const int OPEN_READONLY = SQLITE_OPEN_READONLY;
SQLITECPP_API const int OPEN_READWRITE = SQLITE_OPEN_READWRITE;
SQLITECPP_API const int OPEN_CREATE = SQLITE_OPEN_CREATE;
SQLITECPP_API const int OPEN_URI = SQLITE_OPEN_URI;
SQLITECPP_API const int OPEN_MEMORY = SQLITE_OPEN_MEMORY;
SQLITECPP_API const int OPEN_NOMUTEX = SQLITE_OPEN_NOMUTEX;
SQLITECPP_API const int OPEN_FULLMUTEX = SQLITE_OPEN_FULLMUTEX;
SQLITECPP_API const int OPEN_SHAREDCACHE = SQLITE_OPEN_SHAREDCACHE;
SQLITECPP_API const int OPEN_PRIVATECACHE = SQLITE_OPEN_PRIVATECACHE;
const int OK = SQLITE_OK;
const int OPEN_READONLY = SQLITE_OPEN_READONLY;
const int OPEN_READWRITE = SQLITE_OPEN_READWRITE;
const int OPEN_CREATE = SQLITE_OPEN_CREATE;
const int OPEN_URI = SQLITE_OPEN_URI;
const int OPEN_MEMORY = SQLITE_OPEN_MEMORY;
const int OPEN_NOMUTEX = SQLITE_OPEN_NOMUTEX;
const int OPEN_FULLMUTEX = SQLITE_OPEN_FULLMUTEX;
const int OPEN_SHAREDCACHE = SQLITE_OPEN_SHAREDCACHE;
const int OPEN_PRIVATECACHE = SQLITE_OPEN_PRIVATECACHE;
// check if sqlite version is >= 3.31.0 and SQLITE_OPEN_NOFOLLOW is defined
#if SQLITE_VERSION_NUMBER >= 3031000 && defined(SQLITE_OPEN_NOFOLLOW)
SQLITECPP_API const int OPEN_NOFOLLOW = SQLITE_OPEN_NOFOLLOW;
const int OPEN_NOFOLLOW = SQLITE_OPEN_NOFOLLOW;
#else
SQLITECPP_API const int OPEN_NOFOLLOW = 0;
const int OPEN_NOFOLLOW = 0;
#endif
SQLITECPP_API const char* const VERSION = SQLITE_VERSION;
SQLITECPP_API const int VERSION_NUMBER = SQLITE_VERSION_NUMBER;
const char* const VERSION = SQLITE_VERSION;
const int VERSION_NUMBER = SQLITE_VERSION_NUMBER;
// Return SQLite version string using runtime call to the compiled library
const char* getLibVersion() noexcept