Merge branch 'develop' into eflumerf/RemoveUPS

art-daq · Feb 17, 2025 · b7f6071 · b7f6071
2 parents 2daf095 + 8c901fe
commit b7f6071
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/artdaq-core/Data/ArtdaqMetadata.hh b/artdaq-core/Data/ArtdaqMetadata.hh
@@ -20,4 +20,4 @@ struct artdaq::ArtdaqMetadata
 	std::string metadata_string{};         ///< Unstructured string data
 };
 
-#endif  // artdaq_core_Data_ArtdaqMetadata_hh
+#endif  // artdaq_core_Data_ArtdaqMetadata_hh
diff --git a/artdaq-core/Data/MetadataFragment.cc b/artdaq-core/Data/MetadataFragment.cc
@@ -80,4 +80,4 @@ artdaq::FragmentPtr artdaq::MetadataFragment::CreateMetadataFragment(artdaq::Art
 	ptr += element_size;
 
 	return frag;
-}
+}
diff --git a/artdaq-core/Data/MetadataFragment.hh b/artdaq-core/Data/MetadataFragment.hh
@@ -26,4 +26,4 @@ private:
 	artdaq::Fragment const& artdaq_fragment_;
 };
 
-#endif
+#endif
diff --git a/artdaq-core/Plugins/ArtdaqFragmentNameHelper.hh b/artdaq-core/Plugins/ArtdaqFragmentNameHelper.hh
@@ -35,4 +35,4 @@ private:
 };
 }  // namespace artdaq
 
-#endif  //_artdaq_core_Plugins_ArtdaqFragmentNameHelper_hh_
+#endif  //_artdaq_core_Plugins_ArtdaqFragmentNameHelper_hh_
diff --git a/artdaq-core/Plugins/Artdaq_fragmentNameHelper.cc b/artdaq-core/Plugins/Artdaq_fragmentNameHelper.cc
@@ -14,4 +14,4 @@ ArtdaqFragmentNameHelper::~ArtdaqFragmentNameHelper() = default;
 
 }  // namespace artdaq
 
-DEFINE_ARTDAQ_FRAGMENT_NAME_HELPER(artdaq::ArtdaqFragmentNameHelper)
+DEFINE_ARTDAQ_FRAGMENT_NAME_HELPER(artdaq::ArtdaqFragmentNameHelper)
diff --git a/artdaq-core/Plugins/FragmentNameHelper.hh b/artdaq-core/Plugins/FragmentNameHelper.hh
@@ -211,4 +211,4 @@ makeNameHelper(std::string const& plugin_name, std::string const& unidentified_i
 }
 }  // namespace artdaq
 
-#endif  //_artdaq_core_Plugins_FragmentNameHelper_hh_
+#endif  //_artdaq_core_Plugins_FragmentNameHelper_hh_
diff --git a/test/Core/SharedMemoryTestShims.hh b/test/Core/SharedMemoryTestShims.hh
@@ -11,4 +11,4 @@ inline unsigned GetRandomKey(uint16_t identifier)
 	return gen(rng) + (identifier << 16) + getpid();
 }
 
-#endif
+#endif
diff --git a/test/Utilities/fcl/LookupTarget.fcl b/test/Utilities/fcl/LookupTarget.fcl
@@ -1 +1 @@
-test: {}
+test: {}
-Original file line number
+Diff line change
@@ Expand Up @@
     	ptr += element_size;
     	return frag;
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@ ArtdaqFragmentNameHelper::~ArtdaqFragmentNameHelper() = default;

		} // namespace artdaq

		DEFINE_ARTDAQ_FRAGMENT_NAME_HELPER(artdaq::ArtdaqFragmentNameHelper)
		DEFINE_ARTDAQ_FRAGMENT_NAME_HELPER(artdaq::ArtdaqFragmentNameHelper)