Require C++14 for building SOCI #996
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vadz
force-pushed
the
require-cxx14
branch
4 times, most recently
from
df7c56f
to
3beaf1d
Compare
Prevent them from hanging indefinitely.
vadz
changed the title
This should speed it up a bit.
This is useful for debugging.
vadz
force-pushed
the
require-cxx14
branch
3 times, most recently
from
0852c1e
to
128beac
Compare
Don't prepend CMAKE_CURRENT_SOURCE_DIR to the DSN files, as they may not necessarily be in the source directory. It's also arguably more clear to the specify the DSN fully in the tests makefile instead of modifying it inside soci_backend_test() macro. No real changes yet.
Allow to override the default MS SQL version value (2014) by setting MSSQL_VER environment variable -- this will be used to test SOCI with different versions of MS SQL in the CI builds soon.
Otherwise they're just going to fail anyhow.
Drop MSVS < 2015 versions and add 2019 and 2022 and use (the already available on AppVeyor) gcc 8.1 instead of (manually installed) 4.8.
Don't set CMAKE_CXX_STANDARD in the environment, it will be set in CMake makefiles themselves soon.
Remove checks for C++11 but keep SOCI_OVERRIDE, SOCI_NOEXCEPT etc macros for now, they will be cleaned up later.
Remove SOCI_CXX11 option which doesn't make sense any longer.
No more need for SOCI_STATIC_ASSERT.
Stop using soci::cxx_details::auto_ptr<>. Also use unique_ptr<> for session::query_transformation_ instead of managing its lifetime manually, this is shorter and less error-prone.
This results in build problems with clang 15 and libc++ (see SOCI#984) and also with MSVC due to the use of min/max function that are defined as macros. This is just a temporary workaround, the real solution will be to update our CATCH version.
We don't need the macro any longer now that we use C++14.
Similarly to the previous commit, remove the macro which is not needed any more now that we require C++14.
Krzmbrzl
reviewed
Sep 18, 2022
| @@ -73,15 +73,15 @@ class standard_logger_impl : public logger_impl | |||
| } // namespace anonymous | |||
|
|
|||
| session::session() | |||
| : once(this), prepare(this), query_transformation_(NULL), | |||
| : once(this), prepare(this), | |||
| logger_(new standard_logger_impl), | |||
| uppercaseColumnNames_(false), backEnd_(NULL), | |||
There was a problem hiding this comment.
While transitioning to a modern cpp standard, it would probably also be good to replace all NULL with nullptr
There was a problem hiding this comment.
Yes, I'm going to use clang-tidy to do this later, but let's merge this one first.
|
I think this can be merged now. There are certainly more things to do, e.g. using Sorry if this results in any conflicts with the still open PRs, but hopefully they won't be difficult to resolve. If anybody has any objections to merging this, please comment here soon. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update the CI builds and the code as discussed in #907.