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 for uclibc++ #14

Open
wants to merge 2 commits into
base: fix-for-uclibc++
Choose a base branch
from
Open

Fix for uclibc++ #14

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
b6be19e
ibrdtn: Fix several iterators to compile with uClibc++
neheb May 27, 2019
008c385
ibrdtn: Add two operators needed for uClibc++
neheb May 27, 2019
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: 1 addition & 1 deletion ibrdtn/daemon/src/routing/SchedulingBundleIndex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace dtn
void SchedulingBundleIndex::remove(const dtn::data::BundleID &id)
{
ibrcommon::MutexLock l(_index_mutex);
for (priority_index::const_iterator iter = _priority_index.begin(); iter != _priority_index.end(); ++iter)
for (priority_index::iterator iter = _priority_index.begin(); iter != _priority_index.end(); ++iter)
{
const dtn::data::MetaBundle &b = (*iter);
if (id == (const dtn::data::BundleID&)b) {
Expand Down
2 changes: 1 addition & 1 deletion ibrdtn/daemon/src/storage/MemoryBundleStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ namespace dtn
ibrcommon::MutexLock l(_bundleslock);

// search for the bundle in the bundle list
const bundle_list::const_iterator iter = find(_bundles.begin(), _bundles.end(), id);
const bundle_list::iterator iter = find(_bundles.begin(), _bundles.end(), id);

// if no bundle was found throw an exception
if (iter == _bundles.end()) throw NoBundleFoundException();
Expand Down
2 changes: 1 addition & 1 deletion ibrdtn/daemon/src/storage/MetaStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ namespace dtn
{
std::set<dtn::data::EID> ret;

for (dtn::data::BundleList::const_iterator iter = begin(); iter != end(); ++iter)
for (const_iterator iter = begin(); iter != end(); ++iter)
{
const dtn::data::MetaBundle &bundle = (*iter);

Expand Down
10 changes: 10 additions & 0 deletions ibrdtn/ibrdtn/ibrdtn/data/Bundle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,21 @@ namespace dtn
return other == (const PrimaryBlock&)(*this);
}

bool Bundle::operator!=(const BundleID& other) const
{
return other != (const PrimaryBlock&)(*this);
}

bool Bundle::operator==(const MetaBundle& other) const
{
return other == (const PrimaryBlock&)(*this);
}

bool Bundle::operator!=(const MetaBundle& other) const
{
return other != (const PrimaryBlock&)(*this);
}

bool Bundle::operator!=(const Bundle& other) const
{
return (const PrimaryBlock&)(*this) != (const PrimaryBlock&)other;
Expand Down
2 changes: 2 additions & 0 deletions ibrdtn/ibrdtn/ibrdtn/data/Bundle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ namespace dtn
virtual ~Bundle();

bool operator==(const BundleID& other) const;
bool operator!=(const BundleID& other) const;
bool operator==(const MetaBundle& other) const;
bool operator!=(const MetaBundle& other) const;

bool operator==(const Bundle& other) const;
bool operator!=(const Bundle& other) const;
Expand Down