Fix a number of clang-tidy detected defects

core/base/inc/TBuffer.h

@@ -390,7 +390,7 @@ template <class Tmpl> TBuffer &operator>>(TBuffer &buf, Tmpl *&obj)
    // since the pointer could be zero (so typeid(*obj) is not usable).
 
    auto cl = TClass::GetClass<Tmpl>();
-   obj = (Tmpl *) ( (void*) buf.ReadObjectAny(cl) );
+   obj = reinterpret_cast<Tmpl *>(buf.ReadObjectAny(cl));
    return buf;
 }
 

core/cont/inc/TCollection.h

@@ -267,8 +267,7 @@ class TIter {
    }
    TIter &operator=(TIterator *iter)
    {
-      if (fIterator)
-         delete fIterator;
+      delete fIterator;
       fIterator = iter;
       return *this;
    }

core/foundation/inc/ROOT/RConfig.hxx

@@ -491,6 +491,12 @@
 #define _R__DEPRECATED_644(REASON) _R_DEPRECATED_REMOVE_NOW(REASON)
 #endif
 
+#if ROOT_VERSION_CODE <= ROOT_VERSION(6, 45, 0)
+#define _R__DEPRECATED_646(REASON) _R__DEPRECATED_LATER(REASON)
+#else
+#define _R__DEPRECATED_646(REASON) _R_DEPRECATED_REMOVE_NOW(REASON)
+#endif
+
 /* USE AS `R__DEPRECATED(7,00, "Not threadsafe; use TFoo::Bar().")`
    To be removed by 7.00 */
 #if ROOT_VERSION_CODE < ROOT_VERSION(6,99,0)

core/foundation/inc/ROOT/RError.hxx

@@ -58,9 +58,9 @@ private:
 
 public:
    /// Used by R__FAIL
-   RError(std::string_view message, RLocation &&sourceLocation);
+   RError(std::string_view message, const RLocation &sourceLocation);
    /// Used by R__FORWARD_RESULT
-   void AddFrame(RLocation &&sourceLocation);
+   void AddFrame(const RLocation &sourceLocation);
    /// Add more information to the diagnostics
    void AppendToMessage(std::string_view info) { fMessage += info; }
    /// Format a dignostics report, e.g. for an exception message
@@ -76,11 +76,36 @@ public:
 */
 // clang-format on
 class RException : public std::runtime_error {
-   RError fError;
+   std::optional<RError> fError;
 
 public:
    explicit RException(const RError &error) : std::runtime_error(error.GetReport()), fError(error) {}
-   const RError &GetError() const { return fError; }
+   RException(const RException &other) noexcept : std::runtime_error(other)
+   {
+      // A copy constructor of an exception should not throw; otherwise, during `throw RException(...)`,
+      // a second exception may be thrown that would immediately terminate the program.
+      // The fError member may throw due to the memory allocation in its string and vector members.
+      try {
+         fError = other.fError;
+      } catch (...) {
+         // OOM? Leave fError unset.
+         (void)fError;
+      }
+   }
+   RException(RException &&other) = default;
+   RException &operator=(RException &&other) = default;
+   RException &operator=(const RException &other) = default;
+
+   const RError &GetError() const
+   {
+      if (!fError) {
+         static const RError gOomError = RError("invalid fError in exception, possibly out of memory'",
+                                                {R__LOG_PRETTY_FUNCTION, __FILE__, __LINE__});
+
+         return gOomError;
+      }
+      return *fError;
+   }
 };
 
 // clang-format off
@@ -125,12 +150,12 @@ public:
 
    /// Used by R__FORWARD_ERROR in order to keep track of the stack trace.
    [[nodiscard]]
-   static RError ForwardError(RResultBase &&result, RError::RLocation &&sourceLocation)
+   static RError ForwardError(const RResultBase &result, const RError::RLocation &sourceLocation)
    {
       if (!result.fError) {
-         return RError("internal error: attempt to forward error of successful operation", std::move(sourceLocation));
+         return RError("internal error: attempt to forward error of successful operation", sourceLocation);
       }
-      result.fError->AddFrame(std::move(sourceLocation));
+      result.fError->AddFrame(sourceLocation);
       return *result.fError;
    }
 }; // class RResultBase
@@ -224,13 +249,11 @@ public:
    RResult &operator=(const RResult &other) = delete;
    RResult &operator=(RResult &&other) = default;
 
-   ~RResult() = default;
-
    /// Used by R__FORWARD_RESULT in order to keep track of the stack trace in case of errors
-   RResult &Forward(RError::RLocation &&sourceLocation)
+   RResult &Forward(const RError::RLocation &sourceLocation)
    {
       if (fError)
-         fError->AddFrame(std::move(sourceLocation));
+         fError->AddFrame(sourceLocation);
       return *this;
    }
 
@@ -277,10 +300,10 @@ public:
    ~RResult() = default;
 
    /// Used by R__FORWARD_RESULT in order to keep track of the stack trace in case of errors
-   RResult &Forward(RError::RLocation &&sourceLocation)
+   RResult &Forward(const RError::RLocation &sourceLocation)
    {
       if (fError)
-         fError->AddFrame(std::move(sourceLocation));
+         fError->AddFrame(sourceLocation);
       return *this;
    }
 
@@ -300,7 +323,7 @@ public:
 /// Short-hand to return an RResult<T> value from a subroutine to the calling stack frame
 #define R__FORWARD_RESULT(res) std::move(res.Forward({R__LOG_PRETTY_FUNCTION, __FILE__, __LINE__}))
 /// Short-hand to return an RResult<T> in an error state (i.e. after checking)
-#define R__FORWARD_ERROR(res) res.ForwardError(std::move(res), {R__LOG_PRETTY_FUNCTION, __FILE__, __LINE__})
+#define R__FORWARD_ERROR(res) res.ForwardError(res, {R__LOG_PRETTY_FUNCTION, __FILE__, __LINE__})
 
 } // namespace ROOT
 

core/foundation/inc/RtypesCore.h

@@ -48,6 +48,7 @@ class TRootIOCtor;
 
 //---- types -------------------------------------------------------------------
 
+// clang-format off
 typedef char           Char_t;      ///< Character 1 byte (char) \warning Can be signed (most common) or unsigned depending on platform and compiler flags. \deprecated Consider replacing with `char`, `signed char` or `std::int8_t`
 typedef unsigned char  UChar_t;     ///< Unsigned Character 1 byte (unsigned char) \deprecated Consider replacing with `unsigned char` or `std::uint8_t`
 typedef short          Short_t;     ///< Signed Short integer 2 bytes (short) \deprecated Consider replacing with `short` or `std::int16_t`
@@ -64,7 +65,7 @@ typedef int            Seek_t;      ///< File pointer (int).
 typedef long           Long_t;      ///< Signed long integer 8 bytes (long). Size depends on architecture \deprecated Consider replacing with `long`
 typedef unsigned long  ULong_t;     ///< Unsigned long integer 8 bytes (unsigned long). Size depends on architecture \deprecated Consider replacing with `unsigned long`
 #else
-typedef int            Seek_t;      ///< File pointer (int). 
+typedef int            Seek_t;      ///< File pointer (int).
 typedef long           Long_t;      ///< Signed long integer 4 bytes (long). Size depends on architecture \deprecated Consider replacing with `long`
 typedef unsigned long  ULong_t;     ///< Unsigned long integer 4 bytes (unsigned long). Size depends on architecture \deprecated Consider replacing with `unsigned long`
 #endif
@@ -119,7 +120,7 @@ constexpr UInt_t kMaxUInt = UInt_t(~0);        ///< \deprecated Consider replaci
 constexpr Int_t kMaxInt = Int_t(kMaxUInt >> 1);///< \deprecated Consider replacing with `std::numeric_limits<int>::max()` (or `std::int32_t`)
 constexpr Int_t kMinInt = -kMaxInt - 1;        ///< \deprecated Consider replacing with `std::numeric_limits<int>::lowest()` (or `std::int32_t`)
 
-constexpr ULong_t kMaxULong = ULong_t(~0);         ///< \deprecated Consider replacing with `std::numeric_limits<unsigned long>::max()`
+constexpr ULong_t kMaxULong = ULong_t(-1);         ///< \deprecated Consider replacing with `std::numeric_limits<unsigned long>::max()`
 constexpr Long_t kMaxLong = Long_t(kMaxULong >> 1);///< \deprecated Consider replacing with `std::numeric_limits<long>::max()`
 constexpr Long_t kMinLong = -kMaxLong - 1;         ///< \deprecated Consider replacing with `std::numeric_limits<long>::lowest()`
 
@@ -129,6 +130,7 @@ constexpr Long64_t kMinLong64 = -kMaxLong64 - 1;           ///< \deprecated Cons
 
 constexpr ULong_t kBitsPerByte = 8; ///< \deprecated Consider replacing with `std::numeric_limits<unsigned char>::digits`.
 constexpr Ssiz_t kNPOS = ~(Ssiz_t)0;///< The equivalent of `std::string::npos` for the ROOT class TString. \note Consider using std::string instead of TString whenever possible
+// clang-format on
 
 //---- debug global ------------------------------------------------------------
 

core/foundation/inc/TClassEdit.h

@@ -236,12 +236,12 @@ namespace TClassEdit {
    {
       return 0 == name.compare(0, 17, "std::__pair_base<") || 0 == name.compare(0, 12, "__pair_base<");
    }
-   inline std::string GetUniquePtrType(std::string_view name)
+   inline std::string R__DEPRECATED(6, 46, "not needed anymore") GetUniquePtrType(std::string_view name)
    {
       // Find the first template parameter
       std::vector<std::string> v;
       int i;
-      GetSplit(name.data(), v, i);
+      GetSplit(std::string(name).c_str(), v, i);
       return v[1];
    }
    std::string GetNameForIO(const std::string& templateInstanceName,

core/foundation/src/RError.cxx

@@ -28,15 +28,15 @@ std::string ROOT::RError::GetReport() const
    return report;
 }
 
-ROOT::RError::RError(std::string_view message, RLocation &&sourceLocation) : fMessage(message)
+ROOT::RError::RError(std::string_view message, const RLocation &sourceLocation) : fMessage(message)
 
 {
    // Avoid frequent reallocations as we move up the call stack
    fStackTrace.reserve(32);
-   AddFrame(std::move(sourceLocation));
+   AddFrame(sourceLocation);
 }
 
-void ROOT::RError::AddFrame(RLocation &&sourceLocation)
+void ROOT::RError::AddFrame(const RLocation &sourceLocation)
 {
    fStackTrace.emplace_back(sourceLocation);
 }