cxx20: fix compatibility issues

resiprocate · Jan 16, 2022 · 7e3a34a · 7e3a34a
1 parent 84b1bf3
commit 7e3a34a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/resip/dum/ClientInviteSession.hxx b/resip/dum/ClientInviteSession.hxx
@@ -40,7 +40,7 @@ class ClientInviteSession : public InviteSession
 
       /** Makes the specific dialog end. Will send a BYE (not a CANCEL) */
       void end(const Data& userReason) override;
-      void end(const ParserContainer<Token>& endReasons);
+      void end(const ParserContainer<Token>& endReasons) override;
       void end(EndReason reason) override;
       void end() override;
 

diff --git a/resip/dum/MasterProfile.hxx b/resip/dum/MasterProfile.hxx
@@ -35,7 +35,7 @@ class MasterProfile : public UserProfile
 
       /// Default is none. Do not use to enable PRACK(100rel) support. 
       virtual void addSupportedOptionTag(const Token& tag);        
-      virtual Tokens getUnsupportedOptionsTags(const Tokens& requires); // Returns list of unsupported option tags
+      virtual Tokens getUnsupportedOptionsTags(const Tokens& requiresOptionTags); // Returns list of unsupported option tags
       virtual Tokens getSupportedOptionTags() const;
       virtual void clearSupportedOptionTags() noexcept;
 

diff --git a/resip/stack/DialogInfoContents.hxx b/resip/stack/DialogInfoContents.hxx
@@ -107,7 +107,7 @@ public:
       };
 
       Dialog() : mDirection(MaxOrUnsetDirection), mState(Trying), mStateEvent(MaxOrUnsetDialogStateEvent), mStateCode(0), mDuration(0),
-         mHasDuration(false), mHasAppearance(false), mAppearance(0), mExclusive(false), mHasExclusive(false) {}
+         mHasDuration(false), mAppearance(0), mHasAppearance(false), mExclusive(false), mHasExclusive(false) {}
 
       // Accesors for data
       void setId(const Data& id) { mId = id; }

diff --git a/rutil/StlPoolAllocator.hxx b/rutil/StlPoolAllocator.hxx
@@ -83,7 +83,7 @@ class StlPoolAllocator
          return &ref;
       }
 
-      pointer allocate(size_type n, std::allocator<void>::const_pointer hint=0)
+      pointer allocate(size_type n, const void* hint=0)
       {
          return (pointer)(allocate_raw(n*sizeof(T)));
       }