Updated very minor things

aquarist-labs · Feb 15, 2023 · 7ca5200 · 7ca5200
1 parent 858dc32
commit 7ca5200
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/dev/function.h b/dev/function.h
@@ -161,7 +161,7 @@ namespace sqlite_orm {
         template<size_t I, class PointerArg>
         constexpr bool is_same_pvt_v<I, PointerArg, nullptr_t, polyfill::void_t<typename PointerArg::tag>> = true;
 
-#if __cplusplus >= 201703L  // using C++17 or higher
+#if __cplusplus >= 201703L  // C++17 or later
         template<size_t I, const char* PointerArg, const char* Binding>
         SQLITE_ORM_CONSTEVAL bool assert_same_pointer_type() {
             constexpr bool valid = Binding == PointerArg;

diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
@@ -9805,7 +9805,7 @@ namespace sqlite_orm {
         template<size_t I, class PointerArg>
         constexpr bool is_same_pvt_v<I, PointerArg, nullptr_t, polyfill::void_t<typename PointerArg::tag>> = true;
 
-#if __cplusplus >= 201703L  // using C++17 or higher
+#if __cplusplus >= 201703L  // C++17 or later
         template<size_t I, const char* PointerArg, const char* Binding>
         SQLITE_ORM_CONSTEVAL bool assert_same_pointer_type() {
             constexpr bool valid = Binding == PointerArg;

diff --git a/tests/operators/arithmetic_operators.cpp b/tests/operators/arithmetic_operators.cpp
@@ -35,11 +35,11 @@ TEST_CASE("Arithmetic operators") {
         }
     }
     {  //  +
-        auto rows = storage.select(columns(c(&Object::nameLen) + 1000));
+        auto rows = storage.select(c(&Object::nameLen) + 1000);
         for(size_t i = 0; i < rows.size(); ++i) {
             auto& row = rows[i];
             auto& name = names[i];
-            REQUIRE(int(std::get<0>(row)) == name.length() + 1000);
+            REQUIRE(int(row) == name.length() + 1000);
         }
     }
     {  //  ||
@@ -71,11 +71,11 @@ TEST_CASE("Arithmetic operators") {
     }
     {  //  ||
         std::string suffix = "ototo";
-        auto rows = storage.select(columns(conc(&Object::name, suffix)));
+        auto rows = storage.select(conc(&Object::name, suffix));
         for(size_t i = 0; i < rows.size(); ++i) {
             auto& row = rows[i];
             auto& name = names[i];
-            REQUIRE(std::get<0>(row) == name + suffix);
+            REQUIRE(row == name + suffix);
         }
     }
     {  //  different