From d559562055991511a2018671823178913ff87d82 Mon Sep 17 00:00:00 2001
From: Tim Jenness <tjenness@lsst.org>
Date: Tue, 30 Jul 2024 11:16:48 -0700
Subject: [PATCH] Remove lsst::utils fallback

---
 include/lsst/cpputils/Backtrace.h              | 1 -
 include/lsst/cpputils/Cache.h                  | 1 -
 include/lsst/cpputils/CacheFwd.h               | 1 -
 include/lsst/cpputils/Demangle.h               | 1 -
 include/lsst/cpputils/Magnitude.h              | 1 -
 include/lsst/cpputils/hashCombine.h            | 1 -
 include/lsst/cpputils/packaging.h              | 1 -
 include/lsst/cpputils/python.h                 | 1 -
 include/lsst/cpputils/python/Cache.h           | 1 -
 include/lsst/cpputils/python/PySharedPtr.h     | 1 -
 include/lsst/cpputils/python/TemplateInvoker.h | 1 -
 include/lsst/cpputils/tests.h                  | 1 -
 include/lsst/utils/Backtrace.h                 | 1 -
 include/lsst/utils/Cache.h                     | 1 -
 include/lsst/utils/CacheFwd.h                  | 1 -
 include/lsst/utils/Demangle.h                  | 1 -
 include/lsst/utils/Magnitude.h                 | 1 -
 include/lsst/utils/hashCombine.h               | 1 -
 include/lsst/utils/packaging.h                 | 1 -
 include/lsst/utils/python.h                    | 1 -
 include/lsst/utils/python/Cache.h              | 1 -
 include/lsst/utils/python/PySharedPtr.h        | 1 -
 include/lsst/utils/python/TemplateInvoker.h    | 1 -
 include/lsst/utils/tests.h                     | 1 -
 tests/test_packaging.cc                        | 6 ------
 25 files changed, 30 deletions(-)
 delete mode 120000 include/lsst/utils/Backtrace.h
 delete mode 120000 include/lsst/utils/Cache.h
 delete mode 120000 include/lsst/utils/CacheFwd.h
 delete mode 120000 include/lsst/utils/Demangle.h
 delete mode 120000 include/lsst/utils/Magnitude.h
 delete mode 120000 include/lsst/utils/hashCombine.h
 delete mode 120000 include/lsst/utils/packaging.h
 delete mode 120000 include/lsst/utils/python.h
 delete mode 120000 include/lsst/utils/python/Cache.h
 delete mode 120000 include/lsst/utils/python/PySharedPtr.h
 delete mode 120000 include/lsst/utils/python/TemplateInvoker.h
 delete mode 120000 include/lsst/utils/tests.h

diff --git a/include/lsst/cpputils/Backtrace.h b/include/lsst/cpputils/Backtrace.h
index 96f36e0..4f9e515 100644
--- a/include/lsst/cpputils/Backtrace.h
+++ b/include/lsst/cpputils/Backtrace.h
@@ -62,7 +62,6 @@ class Backtrace final {
 };
 
 }  // namespace cpputils
-namespace utils = cpputils;
 }  // namespace lsst
 
 #endif
diff --git a/include/lsst/cpputils/Cache.h b/include/lsst/cpputils/Cache.h
index 1a0d751..9404571 100644
--- a/include/lsst/cpputils/Cache.h
+++ b/include/lsst/cpputils/Cache.h
@@ -358,7 +358,6 @@ Cache<Key, Value, KeyHash, KeyPred>::~Cache() {
 #endif
 
 }
-namespace utils = cpputils;
 } // namespace lsst::cpputils
 
 
diff --git a/include/lsst/cpputils/CacheFwd.h b/include/lsst/cpputils/CacheFwd.h
index 6e6f719..ee57814 100644
--- a/include/lsst/cpputils/CacheFwd.h
+++ b/include/lsst/cpputils/CacheFwd.h
@@ -37,7 +37,6 @@ template <typename Key, typename Value, typename KeyHash=std::hash<Key>,
 class Cache;
 
 }
-namespace utils = cpputils;
 } // namespace lsst::cpputils
 
 #endif // ifndef LSST_CPPUTILS_CACHE_FWD_H
diff --git a/include/lsst/cpputils/Demangle.h b/include/lsst/cpputils/Demangle.h
index 388e14f..d48f094 100644
--- a/include/lsst/cpputils/Demangle.h
+++ b/include/lsst/cpputils/Demangle.h
@@ -33,6 +33,5 @@ namespace cpputils {
 std::string demangleType(std::string const _typeName);
 
 }
-namespace utils = cpputils;
 } // namespace lsst::cpputils
 #endif
diff --git a/include/lsst/cpputils/Magnitude.h b/include/lsst/cpputils/Magnitude.h
index 1ec897f..3ba7808 100644
--- a/include/lsst/cpputils/Magnitude.h
+++ b/include/lsst/cpputils/Magnitude.h
@@ -52,7 +52,6 @@ double nanojanskyToABMagnitude(double flux);
 double ABMagnitudeToNanojansky(double magnitude);
 
 }  // namespace cpputils
-namespace utils = cpputils;
 }  // namespace lsst
 
 #endif  // LSST_CPPUTILS_MAGNITUDE_H
diff --git a/include/lsst/cpputils/hashCombine.h b/include/lsst/cpputils/hashCombine.h
index 315f1c7..cb1ef86 100644
--- a/include/lsst/cpputils/hashCombine.h
+++ b/include/lsst/cpputils/hashCombine.h
@@ -99,7 +99,6 @@ std::size_t hashIterable(std::size_t seed, InputIterator begin, InputIterator en
 }
 
 }
-namespace utils = cpputils;
 } // namespace lsst::cpputils
 
 #endif
diff --git a/include/lsst/cpputils/packaging.h b/include/lsst/cpputils/packaging.h
index 7c11fa2..77e39df 100644
--- a/include/lsst/cpputils/packaging.h
+++ b/include/lsst/cpputils/packaging.h
@@ -40,7 +40,6 @@ namespace cpputils {
 std::string getPackageDir(std::string const& packageName);
 
 }
-namespace utils = cpputils;
 } // namespace lsst::cpputils
 
 #endif
diff --git a/include/lsst/cpputils/python.h b/include/lsst/cpputils/python.h
index 6128da6..9f598f8 100644
--- a/include/lsst/cpputils/python.h
+++ b/include/lsst/cpputils/python.h
@@ -455,7 +455,6 @@ class LSST_PRIVATE WrapperCollection final {
 
 
 }}
-namespace utils = cpputils;
 }  // namespace lsst::cpputils::python
 
 #endif
diff --git a/include/lsst/cpputils/python/Cache.h b/include/lsst/cpputils/python/Cache.h
index f66ae74..ce25ac0 100644
--- a/include/lsst/cpputils/python/Cache.h
+++ b/include/lsst/cpputils/python/Cache.h
@@ -62,7 +62,6 @@ void declareCache(py::module & mod, std::string const& name) {
 }
 
 }}
-namespace utils = cpputils;
 } // namespace lsst::cpputils::python
 
 #endif // ifndef LSST_CPPUTILS_PYTHON_CACHE_H
diff --git a/include/lsst/cpputils/python/PySharedPtr.h b/include/lsst/cpputils/python/PySharedPtr.h
index 2724ff4..12bc178 100644
--- a/include/lsst/cpputils/python/PySharedPtr.h
+++ b/include/lsst/cpputils/python/PySharedPtr.h
@@ -86,7 +86,6 @@ class PySharedPtr final {
 
 }  // namespace python
 }  // namespace cpputils
-namespace utils = cpputils;
 }  // namespace lsst
 
 // Macro must be called in the global namespace
diff --git a/include/lsst/cpputils/python/TemplateInvoker.h b/include/lsst/cpputils/python/TemplateInvoker.h
index a9b2754..4e0fb77 100644
--- a/include/lsst/cpputils/python/TemplateInvoker.h
+++ b/include/lsst/cpputils/python/TemplateInvoker.h
@@ -181,7 +181,6 @@ class TemplateInvoker {
 };
 
 }}
-namespace utils = cpputils;
 }  // namespace lsst::cpputils::python
 
 #endif
diff --git a/include/lsst/cpputils/tests.h b/include/lsst/cpputils/tests.h
index 190a005..0e52ec7 100644
--- a/include/lsst/cpputils/tests.h
+++ b/include/lsst/cpputils/tests.h
@@ -106,7 +106,6 @@ void assertHashesEqual(T obj1, T obj2) {
 }
 
 }  // namespace cpputils
-namespace utils = cpputils;
 }  // namespace lsst
 
 #endif
diff --git a/include/lsst/utils/Backtrace.h b/include/lsst/utils/Backtrace.h
deleted file mode 120000
index 57c5225..0000000
--- a/include/lsst/utils/Backtrace.h
+++ /dev/null
@@ -1 +0,0 @@
-../cpputils/Backtrace.h
\ No newline at end of file
diff --git a/include/lsst/utils/Cache.h b/include/lsst/utils/Cache.h
deleted file mode 120000
index c1edcf9..0000000
--- a/include/lsst/utils/Cache.h
+++ /dev/null
@@ -1 +0,0 @@
-../cpputils/Cache.h
\ No newline at end of file
diff --git a/include/lsst/utils/CacheFwd.h b/include/lsst/utils/CacheFwd.h
deleted file mode 120000
index 7dff4e3..0000000
--- a/include/lsst/utils/CacheFwd.h
+++ /dev/null
@@ -1 +0,0 @@
-../cpputils/CacheFwd.h
\ No newline at end of file
diff --git a/include/lsst/utils/Demangle.h b/include/lsst/utils/Demangle.h
deleted file mode 120000
index f0f48d0..0000000
--- a/include/lsst/utils/Demangle.h
+++ /dev/null
@@ -1 +0,0 @@
-../cpputils/Demangle.h
\ No newline at end of file
diff --git a/include/lsst/utils/Magnitude.h b/include/lsst/utils/Magnitude.h
deleted file mode 120000
index b017f89..0000000
--- a/include/lsst/utils/Magnitude.h
+++ /dev/null
@@ -1 +0,0 @@
-../cpputils/Magnitude.h
\ No newline at end of file
diff --git a/include/lsst/utils/hashCombine.h b/include/lsst/utils/hashCombine.h
deleted file mode 120000
index 9911393..0000000
--- a/include/lsst/utils/hashCombine.h
+++ /dev/null
@@ -1 +0,0 @@
-../cpputils/hashCombine.h
\ No newline at end of file
diff --git a/include/lsst/utils/packaging.h b/include/lsst/utils/packaging.h
deleted file mode 120000
index ed35ea4..0000000
--- a/include/lsst/utils/packaging.h
+++ /dev/null
@@ -1 +0,0 @@
-../cpputils/packaging.h
\ No newline at end of file
diff --git a/include/lsst/utils/python.h b/include/lsst/utils/python.h
deleted file mode 120000
index 7605e21..0000000
--- a/include/lsst/utils/python.h
+++ /dev/null
@@ -1 +0,0 @@
-../cpputils/python.h
\ No newline at end of file
diff --git a/include/lsst/utils/python/Cache.h b/include/lsst/utils/python/Cache.h
deleted file mode 120000
index 331c07f..0000000
--- a/include/lsst/utils/python/Cache.h
+++ /dev/null
@@ -1 +0,0 @@
-../../cpputils/python/Cache.h
\ No newline at end of file
diff --git a/include/lsst/utils/python/PySharedPtr.h b/include/lsst/utils/python/PySharedPtr.h
deleted file mode 120000
index 5dfbad5..0000000
--- a/include/lsst/utils/python/PySharedPtr.h
+++ /dev/null
@@ -1 +0,0 @@
-../../cpputils/python/PySharedPtr.h
\ No newline at end of file
diff --git a/include/lsst/utils/python/TemplateInvoker.h b/include/lsst/utils/python/TemplateInvoker.h
deleted file mode 120000
index 49c8a7b..0000000
--- a/include/lsst/utils/python/TemplateInvoker.h
+++ /dev/null
@@ -1 +0,0 @@
-../../cpputils/python/TemplateInvoker.h
\ No newline at end of file
diff --git a/include/lsst/utils/tests.h b/include/lsst/utils/tests.h
deleted file mode 120000
index ab0f5b1..0000000
--- a/include/lsst/utils/tests.h
+++ /dev/null
@@ -1 +0,0 @@
-../cpputils/tests.h
\ No newline at end of file
diff --git a/tests/test_packaging.cc b/tests/test_packaging.cc
index b603920..45a13c1 100644
--- a/tests/test_packaging.cc
+++ b/tests/test_packaging.cc
@@ -40,12 +40,6 @@ BOOST_AUTO_TEST_CASE(GetPackage) {
     BOOST_CHECK(std::filesystem::is_regular_file(cpputilsPath / "tests" / "test_packaging.cc"));
     BOOST_CHECK_THROW(getPackageDir("nameOfNonexistendPackage2234q?#!"),
                       lsst::pex::exceptions::NotFoundError);
-
-    // Again with the lsst::utils namespace
-    std::filesystem::path utilsPath{lsst::utils::getPackageDir("cpputils")};
-    BOOST_CHECK(std::filesystem::is_regular_file(utilsPath / "tests" / "test_packaging.cc"));
-    BOOST_CHECK_THROW(lsst::utils::getPackageDir("nameOfNonexistendPackage2234q?#!"),
-                      lsst::pex::exceptions::NotFoundError);
 }
 
 BOOST_AUTO_TEST_SUITE_END()