fix after merge

fnc12 · Sep 30, 2023 · c04bac4 · c04bac4
2 parents 7efd021 + eb7ea99
commit c04bac4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 29 deletions.
diff --git a/dev/ast/match.h b/dev/ast/match.h
@@ -18,5 +18,4 @@ namespace sqlite_orm {
     internal::match_t<T, X> match(X argument) {
         return {std::move(argument)};
     }
-
-}
+}
diff --git a/dev/ast_iterator.h b/dev/ast_iterator.h
@@ -86,6 +86,16 @@ namespace sqlite_orm {
             }
         };
 
+        template<class T, class X>
+        struct ast_iterator<match_t<T, X>, void> {
+            using node_type = match_t<T, X>;
+
+            template<class L>
+            void operator()(const node_type& node, L& lambda) const {
+                iterate_ast(node.argument, lambda);
+            }
+        };
+
         template<class... Args>
         struct ast_iterator<group_by_t<Args...>, void> {
             using node_type = group_by_t<Args...>;
@@ -235,16 +245,6 @@ namespace sqlite_orm {
             }
         };
 
-        template<class T, class X>
-        struct ast_iterator<match_t<T, X>, void> {
-            using node_type = match_t<T, X>;
-
-            template<class L>
-            void operator()(const node_type& node, L& lambda) const {
-                iterate_ast(node.argument, lambda);
-            }
-        };
-
         template<class T>
         struct ast_iterator<into_t<T>, void> {
             using node_type = into_t<T>;

diff --git a/dev/node_tuple.h b/dev/node_tuple.h
@@ -76,6 +76,9 @@ namespace sqlite_orm {
         template<class C>
         struct node_tuple<where_t<C>, void> : node_tuple<C> {};
 
+        template<class T, class X>
+        struct node_tuple<match_t<T, X>, void> : node_tuple<X> {};
+
         /**
          *  Column alias
          */
@@ -169,9 +172,6 @@ namespace sqlite_orm {
         template<class T>
         struct node_tuple<into_t<T>, void> : node_tuple<void> {};
 
-        template<class T, class X>
-        struct node_tuple<match_t<T, X>, void> : node_tuple<X> {};
-
         template<class... Args>
         struct node_tuple<values_t<Args...>, void> {
             using type = tuple_cat_t<node_tuple_t<Args>...>;

diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
@@ -12546,7 +12546,6 @@ namespace sqlite_orm {
     internal::match_t<T, X> match(X argument) {
         return {std::move(argument)};
     }
-
 }
 
 namespace sqlite_orm {
@@ -12613,6 +12612,16 @@ namespace sqlite_orm {
             }
         };
 
+        template<class T, class X>
+        struct ast_iterator<match_t<T, X>, void> {
+            using node_type = match_t<T, X>;
+
+            template<class L>
+            void operator()(const node_type& node, L& lambda) const {
+                iterate_ast(node.argument, lambda);
+            }
+        };
+
         template<class... Args>
         struct ast_iterator<group_by_t<Args...>, void> {
             using node_type = group_by_t<Args...>;
@@ -12762,16 +12771,6 @@ namespace sqlite_orm {
             }
         };
 
-        template<class T, class X>
-        struct ast_iterator<match_t<T, X>, void> {
-            using node_type = match_t<T, X>;
-
-            template<class L>
-            void operator()(const node_type& node, L& lambda) const {
-                iterate_ast(node.argument, lambda);
-            }
-        };
-
         template<class T>
         struct ast_iterator<into_t<T>, void> {
             using node_type = into_t<T>;
@@ -19253,6 +19252,9 @@ namespace sqlite_orm {
         template<class C>
         struct node_tuple<where_t<C>, void> : node_tuple<C> {};
 
+        template<class T, class X>
+        struct node_tuple<match_t<T, X>, void> : node_tuple<X> {};
+
         /**
          *  Column alias
          */
@@ -19346,9 +19348,6 @@ namespace sqlite_orm {
         template<class T>
         struct node_tuple<into_t<T>, void> : node_tuple<void> {};
 
-        template<class T, class X>
-        struct node_tuple<match_t<T, X>, void> : node_tuple<X> {};
-
         template<class... Args>
         struct node_tuple<values_t<Args...>, void> {
             using type = tuple_cat_t<node_tuple_t<Args>...>;
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,5 +18,4 @@ namespace sqlite_orm { @@
         internal::match_t<T, X> match(X argument) {
             return {std::move(argument)};
         }
-    }
+    }