Relocate misplaced #endif annotation

greenc-FNAL · greenc-FNAL · commit e41415146b31 · 2026-02-27T09:27:50.000-06:00
diff --git a/form/core/placement.hpp b/form/core/placement.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __PLACEMENT_HPP__
-#define __PLACEMENT_HPP__
+#ifndef FORM_CORE_PLACEMENT_HPP
+#define FORM_CORE_PLACEMENT_HPP
 
 #include <string>
 
@@ -35,4 +35,4 @@ namespace form::detail::experimental {
   };
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_CORE_PLACEMENT_HPP
diff --git a/form/core/token.hpp b/form/core/token.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __TOKEN_HPP__
-#define __TOKEN_HPP__
+#ifndef FORM_CORE_TOKEN_HPP
+#define FORM_CORE_TOKEN_HPP
 
 #include <string>
 
@@ -41,4 +41,4 @@ namespace form::detail::experimental {
     int m_id;
   };
 } // namespace form::detail::experimental
-#endif
+#endif // FORM_CORE_TOKEN_HPP
diff --git a/form/form/config.hpp b/form/form/config.hpp
@@ -1,5 +1,5 @@
-#ifndef __FORM_CONFIG_HPP__
-#define __FORM_CONFIG_HPP__
+#ifndef FORM_FORM_CONFIG_HPP
+#define FORM_FORM_CONFIG_HPP
 
 #include <map>
 #include <memory>
@@ -53,4 +53,4 @@ namespace form::experimental::config {
 
 } // namespace form::experimental::config
 
-#endif
+#endif // FORM_FORM_CONFIG_HPP
diff --git a/form/form/form.hpp b/form/form/form.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __FORM_HPP__
-#define __FORM_HPP__
+#ifndef FORM_FORM_FORM_HPP
+#define FORM_FORM_FORM_HPP
 
 #include "form/config.hpp"
 #include "persistence/ipersistence.hpp"
@@ -44,4 +44,4 @@ namespace form::experimental {
   };
 }
 
-#endif
+#endif // FORM_FORM_FORM_HPP
diff --git a/form/form/technology.hpp b/form/form/technology.hpp
@@ -1,5 +1,5 @@
-#ifndef __TECHNOLOGY_HPP__
-#define __TECHNOLOGY_HPP__
+#ifndef FORM_FORM_TECHNOLOGY_HPP
+#define FORM_FORM_TECHNOLOGY_HPP
 
 namespace form {
   namespace technology {
@@ -24,4 +24,4 @@ namespace form {
 
 } // namespace form
 
-#endif
+#endif // FORM_FORM_TECHNOLOGY_HPP
diff --git a/form/persistence/ipersistence.hpp b/form/persistence/ipersistence.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __IPERSISTENCE_HPP__
-#define __IPERSISTENCE_HPP__
+#ifndef FORM_PERSISTENCE_IPERSISTENCE_HPP
+#define FORM_PERSISTENCE_IPERSISTENCE_HPP
 
 #include <map>
 #include <memory>
@@ -45,4 +45,4 @@ namespace form::detail::experimental {
 
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_PERSISTENCE_IPERSISTENCE_HPP
diff --git a/form/persistence/persistence.hpp b/form/persistence/persistence.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __PERSISTENCE_HPP__
-#define __PERSISTENCE_HPP__
+#ifndef FORM_PERSISTENCE_PERSISTENCE_HPP
+#define FORM_PERSISTENCE_PERSISTENCE_HPP
 
 #include "ipersistence.hpp"
 
@@ -63,4 +63,4 @@ namespace form::detail::experimental {
 
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_PERSISTENCE_PERSISTENCE_HPP
diff --git a/form/root_storage/root_storage.hpp b/form/root_storage/root_storage.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __ROOT_STORAGE_HPP__
-#define __ROOT_STORAGE_HPP__
+#ifndef FORM_ROOT_STORAGE_ROOT_STORAGE_HPP
+#define FORM_ROOT_STORAGE_ROOT_STORAGE_HPP
 
 #include "storage/storage.hpp"
 
@@ -15,4 +15,4 @@ namespace form::detail::experimental {
 
 } //namespace form::detail::experimental
 
-#endif
+#endif // FORM_ROOT_STORAGE_ROOT_STORAGE_HPP
diff --git a/form/root_storage/root_tbranch_container.hpp b/form/root_storage/root_tbranch_container.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __ROOT_TBRANCH_CONTAINER_HPP__
-#define __ROOT_TBRANCH_CONTAINER_HPP__
+#ifndef FORM_ROOT_STORAGE_ROOT_TBRANCH_CONTAINER_HPP
+#define FORM_ROOT_STORAGE_ROOT_TBRANCH_CONTAINER_HPP
 
 #include "storage/storage_associative_container.hpp"
 
@@ -38,4 +38,4 @@ namespace form::detail::experimental {
 
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_ROOT_STORAGE_ROOT_TBRANCH_CONTAINER_HPP
diff --git a/form/root_storage/root_tfile.hpp b/form/root_storage/root_tfile.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __ROOT_TFILE_HPP__
-#define __ROOT_TFILE_HPP__
+#ifndef FORM_ROOT_STORAGE_ROOT_TFILE_HPP
+#define FORM_ROOT_STORAGE_ROOT_TFILE_HPP
 
 #include "storage/storage_file.hpp"
 
@@ -27,4 +27,4 @@ namespace form::detail::experimental {
 
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_ROOT_STORAGE_ROOT_TFILE_HPP
diff --git a/form/root_storage/root_ttree_container.hpp b/form/root_storage/root_ttree_container.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __ROOT_TTREE_CONTAINER_HPP__
-#define __ROOT_TTREE_CONTAINER_HPP__
+#ifndef FORM_ROOT_STORAGE_ROOT_TTREE_CONTAINER_HPP
+#define FORM_ROOT_STORAGE_ROOT_TTREE_CONTAINER_HPP
 
 #include "storage/storage_association.hpp"
 
@@ -37,4 +37,4 @@ namespace form::detail::experimental {
 
 } //namespace form::detail::experimental
 
-#endif
+#endif // FORM_ROOT_STORAGE_ROOT_TTREE_CONTAINER_HPP
diff --git a/form/storage/istorage.hpp b/form/storage/istorage.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __ISTORAGE_HPP__
-#define __ISTORAGE_HPP__
+#ifndef FORM_STORAGE_ISTORAGE_HPP
+#define FORM_STORAGE_ISTORAGE_HPP
 
 #include "core/placement.hpp"
 #include "core/token.hpp"
@@ -68,4 +68,4 @@ namespace form::detail::experimental {
 
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_STORAGE_ISTORAGE_HPP
diff --git a/form/storage/storage.hpp b/form/storage/storage.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __STORAGE_HPP__
-#define __STORAGE_HPP__
+#ifndef FORM_STORAGE_STORAGE_HPP
+#define FORM_STORAGE_STORAGE_HPP
 
 #include "istorage.hpp"
 
@@ -57,4 +57,4 @@ namespace form::detail::experimental {
 
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_STORAGE_STORAGE_HPP
diff --git a/form/storage/storage_association.hpp b/form/storage/storage_association.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __STORAGE_ASSOCIATION_HPP__
-#define __STORAGE_ASSOCIATION_HPP__
+#ifndef FORM_STORAGE_STORAGE_ASSOCIATION_HPP
+#define FORM_STORAGE_STORAGE_ASSOCIATION_HPP
 
 #include "storage_container.hpp"
 
@@ -19,4 +19,4 @@ namespace form::detail::experimental {
 
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_STORAGE_STORAGE_ASSOCIATION_HPP
diff --git a/form/storage/storage_associative_container.hpp b/form/storage/storage_associative_container.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __STORAGE_ASSOCIATIVE_CONTAINER_HPP__
-#define __STORAGE_ASSOCIATIVE_CONTAINER_HPP__
+#ifndef FORM_STORAGE_STORAGE_ASSOCIATIVE_CONTAINER_HPP
+#define FORM_STORAGE_STORAGE_ASSOCIATIVE_CONTAINER_HPP
 
 #include "storage_container.hpp"
 
@@ -28,4 +28,4 @@ namespace form::detail::experimental {
 
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_STORAGE_STORAGE_ASSOCIATIVE_CONTAINER_HPP
diff --git a/form/storage/storage_container.hpp b/form/storage/storage_container.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __STORAGE_CONTAINER_HPP__
-#define __STORAGE_CONTAINER_HPP__
+#ifndef FORM_STORAGE_STORAGE_CONTAINER_HPP
+#define FORM_STORAGE_STORAGE_CONTAINER_HPP
 
 #include "istorage.hpp"
 
@@ -33,4 +33,4 @@ namespace form::detail::experimental {
   };
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_STORAGE_STORAGE_CONTAINER_HPP
diff --git a/form/storage/storage_file.hpp b/form/storage/storage_file.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 ...
 
-#ifndef __STORAGE_FILE_HPP__
-#define __STORAGE_FILE_HPP__
+#ifndef FORM_STORAGE_STORAGE_FILE_HPP
+#define FORM_STORAGE_STORAGE_FILE_HPP
 
 #include "istorage.hpp"
 
@@ -24,4 +24,4 @@ namespace form::detail::experimental {
   };
 } // namespace form::detail::experimental
 
-#endif
+#endif // FORM_STORAGE_STORAGE_FILE_HPP
diff --git a/form/util/factories.hpp b/form/util/factories.hpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2025 .....
 
-#ifndef __FACTORIES_HPP__
-#define __FACTORIES_HPP__
+#ifndef FORM_UTIL_FACTORIES_HPP
+#define FORM_UTIL_FACTORIES_HPP
 
 #include "form/technology.hpp"
 
@@ -73,4 +73,4 @@ namespace form::detail::experimental {
   }
 
 } // namespace form::detail::experimental
-#endif
+#endif // FORM_UTIL_FACTORIES_HPP
diff --git a/phlex/model/identifier.hpp b/phlex/model/identifier.hpp
@@ -1,5 +1,5 @@
-#ifndef PHLEX_MODEL_IDENTIFIER_H_
-#define PHLEX_MODEL_IDENTIFIER_H_
+#ifndef PHLEX_MODEL_IDENTIFIER_HPP
+#define PHLEX_MODEL_IDENTIFIER_HPP
 
 #include <boost/json/fwd.hpp>
 
@@ -71,4 +71,4 @@ struct std::hash<phlex::experimental::identifier> {
   }
 };
 
-#endif // PHLEX_MODEL_IDENTIFIER_H_
+#endif // PHLEX_MODEL_IDENTIFIER_HPP
diff --git a/phlex/model/type_id.hpp b/phlex/model/type_id.hpp
@@ -1,5 +1,5 @@
-#ifndef PHLEX_MODE_TYPE_ID_HPP
-#define PHLEX_MODE_TYPE_ID_HPP
+#ifndef PHLEX_MODEL_TYPE_ID_HPP
+#define PHLEX_MODEL_TYPE_ID_HPP
 
 #include "phlex/metaprogramming/type_deduction.hpp"
 #include "phlex/model/handle.hpp"
@@ -334,4 +334,4 @@ struct fmt::formatter<phlex::experimental::type_id> : formatter<std::string> {
     return fmt::formatter<std::string>::format(out, ctx);
   }
 };
-#endif // PHLEX_MODE_TYPE_ID_HPP
+#endif // PHLEX_MODEL_TYPE_ID_HPP
diff --git a/plugins/python/src/wrap.hpp b/plugins/python/src/wrap.hpp
@@ -1,5 +1,5 @@
-#ifndef phlex_python_wrap_hpp
-#define phlex_python_wrap_hpp
+#ifndef PLUGINS_PYTHON_SRC_WRAP_HPP
+#define PLUGINS_PYTHON_SRC_WRAP_HPP
 
 // =======================================================================================
 //
@@ -68,4 +68,4 @@ namespace phlex::experimental {
 
 } // namespace phlex::experimental
 
-#endif // phlex_python_pymodule_hpp
+#endif // PLUGINS_PYTHON_SRC_WRAP_HPP
