From 442cf43d3cae521b0fd7042c3e9fe980632ed0d5 Mon Sep 17 00:00:00 2001
From: Kory Draughn <korydraughn@renci.org>
Date: Mon, 1 Apr 2024 15:51:17 -0400
Subject: [PATCH] squash? moved header into private dir. adjusted pragmas

---
 server/api/src/rs_genquery2.cpp                             | 2 +-
 .../genquery2/include/irods/private/genquery2_scanner.hpp   | 6 +++---
 .../irods/{ => private}/genquery2_table_column_mappings.hpp | 0
 server/genquery2/src/genquery2_sql.cpp                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename server/genquery2/include/irods/{ => private}/genquery2_table_column_mappings.hpp (100%)

diff --git a/server/api/src/rs_genquery2.cpp b/server/api/src/rs_genquery2.cpp
index bd3e5b7e88..3078e6b108 100644
--- 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
index 2974ee2f4e..a6b61ff58a 100644
--- 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/server/genquery2/include/irods/genquery2_table_column_mappings.hpp b/server/genquery2/include/irods/private/genquery2_table_column_mappings.hpp
similarity index 100%
rename from server/genquery2/include/irods/genquery2_table_column_mappings.hpp
rename to server/genquery2/include/irods/private/genquery2_table_column_mappings.hpp
diff --git a/server/genquery2/src/genquery2_sql.cpp b/server/genquery2/src/genquery2_sql.cpp
index 1377063379..cdcbdd1df8 100644
--- 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"