From 404d247c4aee1762ad08fb39d6b5064e6f9b3bf9 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 19 Mar 2023 17:01:26 -0700
Subject: [PATCH] get rid of EXV_CALL_MEMBER_FN

std::invoke can be used.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 include/exiv2/types.hpp | 11 -----------
 src/convert.cpp         |  5 +++--
 src/tiffvisitor_int.cpp | 12 +++++-------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/include/exiv2/types.hpp b/include/exiv2/types.hpp
index 6b06aedb9f..efec54b1ef 100644
--- a/include/exiv2/types.hpp
+++ b/include/exiv2/types.hpp
@@ -16,17 +16,6 @@
 #include <sstream>
 #include <vector>
 
-/*!
-  @brief Macro to make calls to member functions through a pointer more readable.
-         See the C++ FAQ LITE, item
-         <a href="http://www.parashift.com/c++-faq-lite/pointers-to-members.html#faq-33.5" title="[33.5] How can I avoid
-  syntax errors when calling a member function using a pointer-to-member-function?">[33.5] How can I avoid syntax errors
-  when calling a member function using a pointer-to-member-function?</a>.
- */
-#define EXV_CALL_MEMBER_FN(object, ptrToMember) ((object).*(ptrToMember))
-
-// *****************************************************************************
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
diff --git a/src/convert.cpp b/src/convert.cpp
index 7cde4b4315..fc92407288 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -19,6 +19,7 @@
 
 // + standard includes
 #include <algorithm>
+#include <functional>
 #include <iomanip>
 
 #if defined _WIN32
@@ -499,7 +500,7 @@ Converter::Converter(IptcData& iptcData, XmpData& xmpData, const char* iptcChars
 void Converter::cnvToXmp() {
   for (auto&& c : conversion_) {
     if ((c.metadataId_ == mdExif && exifData_) || (c.metadataId_ == mdIptc && iptcData_)) {
-      EXV_CALL_MEMBER_FN(*this, c.key1ToKey2_)(c.key1_, c.key2_);
+      std::invoke(c.key1ToKey2_, *this, c.key1_, c.key2_);
     }
   }
 }
@@ -507,7 +508,7 @@ void Converter::cnvToXmp() {
 void Converter::cnvFromXmp() {
   for (auto&& c : conversion_) {
     if ((c.metadataId_ == mdExif && exifData_) || (c.metadataId_ == mdIptc && iptcData_)) {
-      EXV_CALL_MEMBER_FN(*this, c.key2ToKey1_)(c.key2_, c.key1_);
+      std::invoke(c.key2ToKey1_, *this, c.key2_, c.key1_);
     }
   }
 }
diff --git a/src/tiffvisitor_int.cpp b/src/tiffvisitor_int.cpp
index 5def1419fa..2a8fe20e18 100644
--- a/src/tiffvisitor_int.cpp
+++ b/src/tiffvisitor_int.cpp
@@ -16,6 +16,7 @@
 #include "tiffvisitor_int.hpp"  // see bug #487
 #include "value.hpp"
 
+#include <functional>
 #include <iostream>
 
 // *****************************************************************************
@@ -421,11 +422,9 @@ void TiffDecoder::decodeTiffEntry(const TiffEntryBase* object) {
   if (!object->pValue())
     return;
 
-  const DecoderFct decoderFct = findDecoderFct_(make_, object->tag(), object->group());
   // skip decoding if decoderFct == 0
-  if (decoderFct) {
-    EXV_CALL_MEMBER_FN(*this, decoderFct)(object);
-  }
+  if (auto decoderFct = findDecoderFct_(make_, object->tag(), object->group()))
+    std::invoke(decoderFct, *this, object);
 }  // TiffDecoder::decodeTiffEntry
 
 void TiffDecoder::decodeStdTiffEntry(const TiffEntryBase* object) {
@@ -737,10 +736,9 @@ void TiffEncoder::encodeTiffComponent(TiffEntryBase* object, const Exifdatum* da
   // Skip encoding image tags of existing TIFF image - they were copied earlier -
   // but encode image tags of new images (creation)
   if (ed && !isImageTag(object->tag(), object->group())) {
-    const EncoderFct fct = findEncoderFct_(make_, object->tag(), object->group());
-    if (fct) {
+    if (auto fct = findEncoderFct_(make_, object->tag(), object->group())) {
       // If an encoding function is registered for the tag, use it
-      EXV_CALL_MEMBER_FN(*this, fct)(object, ed);
+      std::invoke(fct, *this, object, ed);
     } else {
       // Else use the encode function at the object (results in a double-dispatch
       // to the appropriate encoding function of the encoder.