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

Fix compilation with the not yet released GCC 15 #1753

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Fix compilation with the not yet released GCC 15 #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58f4260
[SegTemplate] Fix compilation with GCC 15
neo1973 Jan 6, 2025
ad3428b
[SegmentList] Fix compilation with GCC 15
neo1973 Jan 6, 2025
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
6 changes: 0 additions & 6 deletions src/common/SegTemplate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ using namespace PLAYLIST;
using namespace UTILS;
using namespace kodi::tools;

PLAYLIST::CSegmentTemplate::CSegmentTemplate(const std::optional<CSegmentTemplate>& other)
{
if (other.has_value())
*this = *other;
}

std::string PLAYLIST::CSegmentTemplate::GetInitialization() const
{
if (!m_initialization.empty())
Expand Down
1 change: 0 additions & 1 deletion src/common/SegTemplate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class ATTR_DLL_LOCAL CSegmentTemplate
{
public:
CSegmentTemplate() = default;
CSegmentTemplate(const std::optional<CSegmentTemplate>& other);
~CSegmentTemplate() = default;

std::string GetInitialization() const;
Expand Down
6 changes: 0 additions & 6 deletions src/common/SegmentList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@

using namespace PLAYLIST;

PLAYLIST::CSegmentList::CSegmentList(const std::optional<CSegmentList>& other)
{
if (other.has_value())
*this = *other;
}

void PLAYLIST::CSegmentList::SetInitRange(std::string_view range)
{
if (!ParseRangeRFC(range, m_initRangeBegin, m_initRangeEnd))
Expand Down
1 change: 0 additions & 1 deletion src/common/SegmentList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class ATTR_DLL_LOCAL CSegmentList
{
public:
CSegmentList() = default;
CSegmentList(const std::optional<CSegmentList>& other);
~CSegmentList() = default;

uint64_t GetStartNumber() const { return m_startNumber; }
Expand Down
8 changes: 4 additions & 4 deletions src/parser/DASHTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ void adaptive::CDashTree::ParseTagAdaptationSet(pugi::xml_node nodeAdp, PLAYLIST
xml_node nodeSegTpl = nodeAdp.child("SegmentTemplate");
if (nodeSegTpl || period->HasSegmentTemplate())
{
CSegmentTemplate segTemplate{period->GetSegmentTemplate()};
auto segTemplate = period->GetSegmentTemplate().value_or(CSegmentTemplate());

if (nodeSegTpl)
ParseSegmentTemplate(nodeSegTpl, segTemplate);
Expand All @@ -595,7 +595,7 @@ void adaptive::CDashTree::ParseTagAdaptationSet(pugi::xml_node nodeAdp, PLAYLIST
xml_node nodeSeglist = nodeAdp.child("SegmentList");
if (nodeSeglist)
{
CSegmentList segList{adpSet->GetSegmentList()};
auto segList = adpSet->GetSegmentList().value_or(CSegmentList());

uint64_t duration;
if (XML::QueryAttrib(nodeSeglist, "duration", duration))
Expand Down Expand Up @@ -824,7 +824,7 @@ void adaptive::CDashTree::ParseTagRepresentation(pugi::xml_node nodeRepr,
xml_node nodeSegTpl = nodeRepr.child("SegmentTemplate");
if (nodeSegTpl || adpSet->HasSegmentTemplate())
{
CSegmentTemplate segTemplate{adpSet->GetSegmentTemplate()};
auto segTemplate = adpSet->GetSegmentTemplate().value_or(CSegmentTemplate());

if (nodeSegTpl)
ParseSegmentTemplate(nodeSegTpl, segTemplate);
Expand All @@ -841,7 +841,7 @@ void adaptive::CDashTree::ParseTagRepresentation(pugi::xml_node nodeRepr,
xml_node nodeSeglist = nodeRepr.child("SegmentList");
if (nodeSeglist)
{
CSegmentList segList{adpSet->GetSegmentList()};
auto segList = adpSet->GetSegmentList().value_or(CSegmentList());

uint64_t duration;
if (XML::QueryAttrib(nodeSeglist, "duration", duration))
Expand Down
Loading