Merge pull request #69 from irieger/cpp20-compatibility-patch

Add a compatibility fix for C++20
bbc · May 13, 2024 · 6e64980 · 6e64980
2 parents 38204bb + 957960b
commit 6e64980
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/deps/libMXFpp/libMXF++/MXFVersion.cpp b/deps/libMXFpp/libMXF++/MXFVersion.cpp
@@ -33,6 +33,8 @@
 #include "config.h"
 #endif
 
+#include <string>
+
 #include "git.h"
 #include "fallback_git_version.h"
 

diff --git a/src/common/Version.cpp b/src/common/Version.cpp
@@ -219,7 +219,7 @@ mxfProductVersion bmx::get_bmx_mxf_product_version()
  // Set the patch version value to the commit offset from the release tag.
  // The commit offset is part of the git describe tag string which has the
  // format "<tag>-<offset>-g<commit id>"
- string describe = bmx_git::DescribeTag();
+ string describe = std::string(bmx_git::DescribeTag());
 #ifdef PACKAGE_GIT_VERSION_STRING
  if (describe.empty() || describe == "unknown")
  describe = PACKAGE_GIT_VERSION_STRING;