squash? moved header into private dir. adjusted pragmas

korydraughn · Apr 1, 2024 · 442cf43 · 442cf43
1 parent edd4b7a
commit 442cf43
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/server/api/src/rs_genquery2.cpp b/server/api/src/rs_genquery2.cpp
@@ -2,10 +2,10 @@
 
 #include "irods/private/genquery2_driver.hpp"
 #include "irods/private/genquery2_sql.hpp"
+#include "irods/private/genquery2_table_column_mappings.hpp"
 
 #include "irods/apiHandler.hpp"
 #include "irods/catalog_utilities.hpp"
-#include "irods/genquery2_table_column_mappings.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_rs_comm_query.hpp"
 #include "irods/irods_server_properties.hpp"

diff --git a/server/genquery2/include/irods/private/genquery2_scanner.hpp b/server/genquery2/include/irods/private/genquery2_scanner.hpp
@@ -16,10 +16,10 @@ namespace irods::experimental::genquery2
     class scanner : public yyFlexLexer
     {
       public:
-        #pragma clang diagnostic push
-        #pragma clang diagnostic ignored "-Woverloaded-virtual"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Woverloaded-virtual"
         auto yylex(driver& _driver) -> yy::parser::symbol_type;
-        #pragma clang diagnostic pop
+#pragma clang diagnostic pop
     }; // class scanner
 } // namespace irods::experimental::genquery2
 

diff --git a/...irods/genquery2_table_column_mappings.hpp → ...ivate/genquery2_table_column_mappings.hpp b/...irods/genquery2_table_column_mappings.hpp → ...ivate/genquery2_table_column_mappings.hpp
diff --git a/server/genquery2/src/genquery2_sql.cpp b/server/genquery2/src/genquery2_sql.cpp
@@ -3,7 +3,7 @@
 #include "irods/private/genquery2_ast_types.hpp"
 #include "irods/private/vertex_property.hpp"
 #include "irods/private/edge_property.hpp"
-#include "irods/genquery2_table_column_mappings.hpp"
+#include "irods/private/genquery2_table_column_mappings.hpp"
 
 #include "irods/irods_at_scope_exit.hpp"
 #include "irods/irods_logger.hpp"