3party/sqlpp11
0
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-16 04:47:18 +08:00
Code Issues Projects Releases Wiki Activity

Rename macro CXX_STD_VER -> SQLPP_CXX_STD

Browse Source
This commit is contained in:
MeanSquaredError 2024-09-03 12:04:43 +03:00 committed by Roland Bock
parent f56564d632
commit a710e8bd89
10 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/sqlpp11/compat/cxx_std_ver.h
View File

@ -1,7 +0,0 @@
#pragma once
#ifdef _MSVC_LANG
#define CXX_STD_VER _MSVC_LANG
#else
#define CXX_STD_VER __cplusplus
#endif

4
include/sqlpp11/compat/make_unique.h
View File

@ -26,7 +26,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sqlpp11/compat/cxx_std_ver.h> #include <sqlpp11/compat/sqlpp_cxx_std.h>
#include <memory> #include <memory>
@ -37,7 +37,7 @@ namespace sqlpp
template <typename T, typename... Args> template <typename T, typename... Args>
std::unique_ptr<T> make_unique(Args&&... args) std::unique_ptr<T> make_unique(Args&&... args)
{ {
#if CXX_STD_VER >= 201402L #if SQLPP_CXX_STD >= 201402L
return std::make_unique<T>(std::forward<Args>(args)...); return std::make_unique<T>(std::forward<Args>(args)...);
#else #else
return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); return std::unique_ptr<T>(new T(std::forward<Args>(args)...));

7
include/sqlpp11/compat/sqlpp_cxx_std.h Normal file
View File

@ -0,0 +1,7 @@
#pragma once
#ifdef _MSVC_LANG
#define SQLPP_CXX_STD _MSVC_LANG
#else
#define SQLPP_CXX_STD __cplusplus
#endif

6
include/sqlpp11/data_types/text/operand.h
View File

@ -26,11 +26,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sqlpp11/compat/cxx_std_ver.h> #include <sqlpp11/compat/sqlpp_cxx_std.h>
#include <string> #include <string>
#include <utility> #include <utility>
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
#include <string_view> #include <string_view>
#endif #endif
#include <sqlpp11/type_traits.h> #include <sqlpp11/type_traits.h>
@ -53,7 +53,7 @@ namespace sqlpp
text_operand(_value_t t) : _t(std::move(t)) text_operand(_value_t t) : _t(std::move(t))
{ {
} }
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
// allow construction from an std::string_view // allow construction from an std::string_view
text_operand(std::string_view t) : _t(t) text_operand(std::string_view t) : _t(t)
{ {

6
include/sqlpp11/data_types/text/parameter_value.h
View File

@ -26,7 +26,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sqlpp11/compat/cxx_std_ver.h> #include <sqlpp11/compat/sqlpp_cxx_std.h>
#include <sqlpp11/data_types/parameter_value.h> #include <sqlpp11/data_types/parameter_value.h>
#include <sqlpp11/data_types/parameter_value_base.h> #include <sqlpp11/data_types/parameter_value_base.h>
@ -34,7 +34,7 @@
#include <sqlpp11/data_types/text/wrap_operand.h> #include <sqlpp11/data_types/text/wrap_operand.h>
#include <sqlpp11/data_types/text/operand.h> #include <sqlpp11/data_types/text/operand.h>
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
#include <string_view> #include <string_view>
#endif #endif
@ -53,7 +53,7 @@ namespace sqlpp
target._bind_text_parameter(index, &_value, _is_null); target._bind_text_parameter(index, &_value, _is_null);
} }
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
parameter_value_base& operator=(const std::string_view& val) parameter_value_base& operator=(const std::string_view& val)
{ {
_value = val; _value = val;

6
include/sqlpp11/data_types/text/wrap_operand.h
View File

@ -26,10 +26,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sqlpp11/compat/cxx_std_ver.h> #include <sqlpp11/compat/sqlpp_cxx_std.h>
#include <utility> #include <utility>
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
#include <string_view> #include <string_view>
#endif #endif
#include <sqlpp11/type_traits.h> #include <sqlpp11/type_traits.h>
@ -39,7 +39,7 @@ namespace sqlpp
{ {
struct text_operand; struct text_operand;
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
using checked_type = std::string_view; using checked_type = std::string_view;
#else #else
using checked_type = std::string; using checked_type = std::string;

4
include/sqlpp11/result.h
View File

@ -26,7 +26,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sqlpp11/compat/cxx_std_ver.h> #include <sqlpp11/compat/sqlpp_cxx_std.h>
#include <functional> #include <functional>
#include <iterator> #include <iterator>
@ -83,7 +83,7 @@ namespace sqlpp
class iterator class iterator
{ {
public: public:
#if CXX_STD_VER >= 202002L #if SQLPP_CXX_STD >= 202002L
using iterator_concept = std::input_iterator_tag; using iterator_concept = std::input_iterator_tag;
#else #else
// LegacyInputIterator describes best our iterator's capabilities. However our iterator does not // LegacyInputIterator describes best our iterator's capabilities. However our iterator does not

4
tests/core/serialize/Insert.cpp
View File

@ -23,7 +23,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sqlpp11/compat/cxx_std_ver.h> #include <sqlpp11/compat/sqlpp_cxx_std.h>
#include "compare.h" #include "compare.h"
#include "Sample.h" #include "Sample.h"
@ -49,7 +49,7 @@ int Insert(int, char* [])
"INSERT INTO tab_bar (beta,gamma) VALUES('cheesecake'," + getTrue() + ")"); "INSERT INTO tab_bar (beta,gamma) VALUES('cheesecake'," + getTrue() + ")");
compare(__LINE__, insert_into(bar).set(bar.beta = ::sqlpp::null, bar.gamma = true), compare(__LINE__, insert_into(bar).set(bar.beta = ::sqlpp::null, bar.gamma = true),
"INSERT INTO tab_bar (beta,gamma) VALUES(NULL," + getTrue() + ")"); "INSERT INTO tab_bar (beta,gamma) VALUES(NULL," + getTrue() + ")");
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
// string_view argument // string_view argument
std::string_view cheeseCake = "cheesecake"; std::string_view cheeseCake = "cheesecake";
compare(__LINE__, insert_into(bar).set(bar.beta = cheeseCake, bar.gamma = true), compare(__LINE__, insert_into(bar).set(bar.beta = cheeseCake, bar.gamma = true),

4
tests/core/serialize/Where.cpp
View File

@ -23,7 +23,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sqlpp11/compat/cxx_std_ver.h> #include <sqlpp11/compat/sqlpp_cxx_std.h>
#include "compare.h" #include "compare.h"
#include "Sample.h" #include "Sample.h"
@ -70,7 +70,7 @@ int Where(int, char*[])
compare(__LINE__, where(is_equal_to_or_null(bar.beta, ::sqlpp::value_or_null("SQL"))), " WHERE (tab_bar.beta='SQL')"); compare(__LINE__, where(is_equal_to_or_null(bar.beta, ::sqlpp::value_or_null("SQL"))), " WHERE (tab_bar.beta='SQL')");
compare(__LINE__, where(is_equal_to_or_null(bar.beta, ::sqlpp::value_or_null<sqlpp::text>(::sqlpp::null))), compare(__LINE__, where(is_equal_to_or_null(bar.beta, ::sqlpp::value_or_null<sqlpp::text>(::sqlpp::null))),
" WHERE tab_bar.beta IS NULL"); " WHERE tab_bar.beta IS NULL");
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
// string_view argument // string_view argument
std::string_view sqlString = "SQL"; std::string_view sqlString = "SQL";
compare(__LINE__, where(bar.beta == sqlString), " WHERE (tab_bar.beta='SQL')"); compare(__LINE__, where(bar.beta == sqlString), " WHERE (tab_bar.beta='SQL')");

6
tests/core/usage/Insert.cpp
View File

@ -23,13 +23,13 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sqlpp11/compat/cxx_std_ver.h> #include <sqlpp11/compat/sqlpp_cxx_std.h>
#include "MockDb.h" #include "MockDb.h"
#include "Sample.h" #include "Sample.h"
#include "is_regular.h" #include "is_regular.h"
#include <iostream> #include <iostream>
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
#include <string_view> #include <string_view>
#endif #endif
#include <sqlpp11/functions.h> #include <sqlpp11/functions.h>
@ -111,7 +111,7 @@ int Insert(int, char*[])
prepared_insert.params.delta = sqlpp::value_or_null(17); prepared_insert.params.delta = sqlpp::value_or_null(17);
db(prepared_insert); db(prepared_insert);
#if CXX_STD_VER >= 201703L #if SQLPP_CXX_STD >= 201703L
auto prepared_insert_sv = db.prepare(insert_into(t).set(t.gamma = parameter(t.gamma), t.delta = parameter(t.delta), t.beta = parameter(t.beta))); auto prepared_insert_sv = db.prepare(insert_into(t).set(t.gamma = parameter(t.gamma), t.delta = parameter(t.delta), t.beta = parameter(t.beta)));
prepared_insert_sv.params.gamma = true; prepared_insert_sv.params.gamma = true;
prepared_insert_sv.params.delta = 17; prepared_insert_sv.params.delta = 17;