DM-45486: Remove lsst::utils fallback

include/lsst/cpputils/Backtrace.h

@@ -62,7 +62,6 @@ class Backtrace final {
 };
 
 }  // namespace cpputils
-namespace utils = cpputils;
 }  // namespace lsst
 
 #endif

include/lsst/cpputils/Cache.h

@@ -358,7 +358,6 @@ Cache<Key, Value, KeyHash, KeyPred>::~Cache() {
 #endif
 
 }
-namespace utils = cpputils;
 } // namespace lsst::cpputils
 
 

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

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

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

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

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

include/lsst/cpputils/python.h

@@ -455,7 +455,6 @@ class LSST_PRIVATE WrapperCollection final {
 
 
 }}
-namespace utils = cpputils;
 }  // namespace lsst::cpputils::python
 
 #endif

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

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

include/lsst/cpputils/python/TemplateInvoker.h

@@ -181,7 +181,6 @@ class TemplateInvoker {
 };
 
 }}
-namespace utils = cpputils;
 }  // namespace lsst::cpputils::python
 
 #endif

include/lsst/cpputils/tests.h

@@ -106,7 +106,6 @@ void assertHashesEqual(T obj1, T obj2) {
 }
 
 }  // namespace cpputils
-namespace utils = cpputils;
 }  // namespace lsst
 
 #endif

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()