fixed -Wlifetime-safety-intra-tu-constructor-suggestions Clang warnings

Author: firewave

CMakeLists.txt

@@ -81,8 +81,8 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     # the warnings were introduced with Clang 23
     if(CMAKE_CXX_STANDARD LESS 20)
         add_compile_options_safe(-Wno-lifetime-safety-intra-tu-suggestions)
+        add_compile_options_safe(-Wno-lifetime-safety-intra-tu-constructor-suggestions)
     endif()
-    add_compile_options_safe(-Wno-lifetime-safety-intra-tu-constructor-suggestions)
     add_compile_options_safe(-Wno-lifetime-safety-cross-tu-constructor-suggestions)
 
     # TODO: fix these?

simplecpp.cpp

@@ -368,7 +368,7 @@ namespace {
     class StdIStream : public simplecpp::TokenList::Stream {
     public:
         // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-        explicit StdIStream(std::istream &istr)
+        explicit StdIStream(std::istream &istr SIMPLECPP_LIFETIMEBOUND)
             : istr(istr) {
             assert(istr.good());
             init();
@@ -394,7 +394,7 @@ namespace {
     class StdCharBufStream : public simplecpp::TokenList::Stream {
     public:
         // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-        StdCharBufStream(const unsigned char* str, std::size_t size)
+        StdCharBufStream(const unsigned char* str SIMPLECPP_LIFETIMEBOUND, std::size_t size)
             : str(str)
             , size(size)
         {
@@ -1508,12 +1508,12 @@ namespace simplecpp {
 
     class Macro {
     public:
-        explicit Macro(std::vector<std::string> &f) : nameTokDef(nullptr), valueToken(nullptr), endToken(nullptr), files(f), tokenListDefine(f), variadic(false), variadicOpt(false), valueDefinedInCode_(false) {}
+        explicit Macro(std::vector<std::string> &f SIMPLECPP_LIFETIMEBOUND) : nameTokDef(nullptr), valueToken(nullptr), endToken(nullptr), files(f), tokenListDefine(f), variadic(false), variadicOpt(false), valueDefinedInCode_(false) {}
 
         /**
          * @throws std::runtime_error thrown on bad macro syntax
          */
-        Macro(const Token *tok, std::vector<std::string> &f) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(true) {
+        Macro(const Token *tok, std::vector<std::string> &f SIMPLECPP_LIFETIMEBOUND) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(true) {
             if (sameline(tok->previousSkipComments(), tok))
                 throw std::runtime_error("bad macro syntax");
             if (tok->op != '#')
@@ -1532,7 +1532,7 @@ namespace simplecpp {
         /**
          * @throws std::runtime_error thrown on bad macro syntax
          */
-        Macro(const std::string &name, const std::string &value, std::vector<std::string> &f) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(false) {
+        Macro(const std::string &name, const std::string &value, std::vector<std::string> &f SIMPLECPP_LIFETIMEBOUND) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(false) {
             const std::string def(name + ' ' + value);
             StdCharBufStream stream(reinterpret_cast<const unsigned char*>(def.data()), def.size());
             tokenListDefine.readfile(stream);

simplecpp.h

@@ -86,7 +86,7 @@ namespace simplecpp {
     {
         // cppcheck-suppress noExplicitConstructor
         // NOLINTNEXTLINE(misc-explicit-constructor)
-        View(const char* data)
+        View(const char* data SIMPLECPP_LIFETIMEBOUND)
             : mData(data)
             , mSize(strlen(data))
         {}
@@ -100,7 +100,7 @@ namespace simplecpp {
 
         // cppcheck-suppress noExplicitConstructor
         // NOLINTNEXTLINE(misc-explicit-constructor)
-        View(const std::string& str)
+        View(const std::string& str )
             : mData(str.data())
             , mSize(str.size())
         {}