if scoping, return nullptr

Author: paulgessinger

Core/src/Geometry/GeometryModuleLoader.cpp

@@ -93,8 +93,8 @@ std::shared_ptr<TrackingGeometry> loadGeometryModuleImpl(
 
   // Validate user_data_type: both sides must agree on whether userData is
   // needed and what type it is.
-  const char* actualType = descriptor->user_data_type;
-  if (!((expectedUserDataType == nullptr && actualType == nullptr) ||
+  if (const char* actualType = descriptor->user_data_type;
+      !((expectedUserDataType == nullptr && actualType == nullptr) ||
         (expectedUserDataType != nullptr && actualType != nullptr &&
          std::strcmp(actualType, expectedUserDataType) == 0))) {
     if (actualType == nullptr) {

docs/examples/geometry_module_template.cpp

@@ -17,7 +17,7 @@ std::unique_ptr<Acts::TrackingGeometry> buildMyGeometry(
     const Acts::Logger& logger) {
   ACTS_INFO("Building my geometry");
   // ... construct and return a TrackingGeometry ...
-  throw std::logic_error("not implemented");
+  return nullptr;
 }
 }  // namespace
 

docs/examples/geometry_module_template_dd4hep.cpp

@@ -20,7 +20,7 @@ std::unique_ptr<Acts::TrackingGeometry> buildMyGeometry(
   (void)detector;
   ACTS_INFO("Building DD4hep geometry");
   // ... use detector to build and return a TrackingGeometry ...
-  throw std::logic_error("not implemented");
+  return nullptr;
 }
 }  // namespace