diff options
| author | jhurst <jhurst@cinecert.com> | 2020-02-10 08:52:48 -0800 |
|---|---|---|
| committer | jhurst <jhurst@cinecert.com> | 2020-02-10 08:52:48 -0800 |
| commit | 03ba76d3a337c6ae2fc35f3b96fa230d0c40ca44 (patch) | |
| tree | b7ab5b9e6e4fbce16a130644f7d2c6dd9a78ac28 /src/MXF.h | |
| parent | cdf50723fe234d97a34bd3152be5a4cdc6f4425e (diff) | |
| parent | e187a605257a3ff9d8a84d23003a9f2bd13a12ac (diff) | |
Merge branch 'master' into htj2chtj2c
* master:
Fix typo. I believe this actually references SMPTE RP 2057 "Text-Based Metadata Carriage in MXF" (implemented as part of commit f4061a21fffad4fdf8dbb2f193f0f0960b25421c).
Fix Object ref not being written: this prevented GenericStreamTextBasedSet to be correctly linked to TextBasedDMFramework
Diffstat (limited to 'src/MXF.h')
| -rwxr-xr-x | src/MXF.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -253,7 +253,7 @@ namespace ASDCP } bool operator==(const PropertyType& rhs) const { return this->m_property == rhs; } bool operator==(const optional_property<PropertyType>& rhs) const { return this->m_property == rhs.m_property; } - operator PropertyType&() { return this->m_property; } + operator const PropertyType&() const { return this->m_property; } void set(const PropertyType& rhs) { this->m_property = rhs; this->m_has_value = true; } void set_has_value(bool has_value = true) { this->m_has_value = has_value; } void reset(const PropertyType& rhs) { this->m_has_value = false; } |
