Skip to content

Fix preprocessor issues #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 13, 2022
Merged

Fix preprocessor issues #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a151084
Do not compare the version number for external SQLite3 libraries
jowr Dec 13, 2022
f1f1748
Correct use of the __has_include preprocessor macro
jowr Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/SQLiteCpp/Database.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_13_0

// disable the support if the required header is not available
#ifdef __has_include
#ifndef __has_include(<filesystem>)
#if !__has_include(<filesystem>)
#undef SQLITECPP_HAVE_STD_FILESYSTEM
#endif
#ifndef __has_include(<experimental/filesystem>)
#if !__has_include(<experimental/filesystem>)
#undef SQLITECPP_HAVE_EXPERIMENTAL_FILESYSTEM
#endif
#endif
Expand Down
2 changes: 2 additions & 0 deletions tests/Database_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ void assertion_failed(const char* apFile, const long apLine, const char* apFunc,
}
#endif

#ifdef SQLITECPP_INTERNAL_SQLITE
TEST(SQLiteCpp, version)
{
EXPECT_STREQ(SQLITE_VERSION, SQLite::VERSION);
EXPECT_EQ (SQLITE_VERSION_NUMBER, SQLite::VERSION_NUMBER);
EXPECT_STREQ(SQLITE_VERSION, SQLite::getLibVersion());
EXPECT_EQ (SQLITE_VERSION_NUMBER, SQLite::getLibVersionNumber());
}
#endif

TEST(Database, ctorExecCreateDropExist)
{
Expand Down