Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a compatibility fix for C++20 #69

Merged
merged 1 commit into from
May 13, 2024
Merged

Add a compatibility fix for C++20 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deps/libMXFpp/libMXF++/MXFVersion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include "config.h"
#endif

#include <string>

#include "git.h"
#include "fallback_git_version.h"

Expand Down
2 changes: 1 addition & 1 deletion src/common/Version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down