Token: use std::unique_ptr for mRef and mRefTemp

Author: firewave

lib/token.cpp

@@ -2647,8 +2647,6 @@ Token::Impl::~Impl()
     delete mOriginalName;
     delete mValueType;
     delete mValues;
-    delete mRefs;
-    delete mRefsTemp;
 
     if (mTemplateSimplifierPointers) {
         for (auto *p : *mTemplateSimplifierPointers) {
@@ -2745,11 +2743,11 @@ const SmallVector<ReferenceToken>& Token::refs(bool temporary) const
 {
     if (temporary) {
         if (!mImpl->mRefsTemp)
-            mImpl->mRefsTemp = new SmallVector<ReferenceToken>(followAllReferences(this, true));
+            mImpl->mRefsTemp.reset(new SmallVector<ReferenceToken>(followAllReferences(this, true)));
         return *mImpl->mRefsTemp;
     }
 
     if (!mImpl->mRefs)
-        mImpl->mRefs = new SmallVector<ReferenceToken>(followAllReferences(this, false));
+        mImpl->mRefs.reset(new SmallVector<ReferenceToken>(followAllReferences(this, false)));
     return *mImpl->mRefs;
 }

lib/token.h

@@ -120,7 +120,7 @@ class CPPCHECKLIB Token {
         // symbol database information
         const Scope* mScope{};
         union {
-            const Function *mFunction;
+            const Function *mFunction{};
             const Variable *mVariable;
             const ::Type* mType;
             const Enumerator *mEnumerator;
@@ -168,14 +168,13 @@ class CPPCHECKLIB Token {
 
         TokenDebug mDebug{};
 
-        SmallVector<ReferenceToken>* mRefs{};
-        SmallVector<ReferenceToken>* mRefsTemp{};
+        std::unique_ptr<SmallVector<ReferenceToken>> mRefs;
+        std::unique_ptr<SmallVector<ReferenceToken>> mRefsTemp;
 
         void setCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint value);
         bool getCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint &value) const;
 
-        Impl() : mFunction(nullptr) {}
-
+        Impl() = default;
         ~Impl();
 
         Impl(const Impl &) = delete;