mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
ibrdtn: Switch to uClibc++
Added needed patches. Some are upstream backports. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
From 1395d849d73147319ee422d2ce34de0bcb90e6f8 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Morgenroth <jm@m-network.de>
|
||||
Date: Thu, 3 Jan 2019 07:34:14 +0100
|
||||
Subject: [PATCH] Use std::streamoff instead of std::streampos
|
||||
|
||||
---
|
||||
ibrdtn/data/BundleMerger.cpp | 2 +-
|
||||
ibrdtn/data/Dictionary.cpp | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/ibrdtn/data/BundleMerger.cpp b/ibrdtn/data/BundleMerger.cpp
|
||||
index 1cd20c522..b71a0849b 100644
|
||||
--- a/ibrdtn/data/BundleMerger.cpp
|
||||
+++ b/ibrdtn/data/BundleMerger.cpp
|
||||
@@ -119,7 +119,7 @@ namespace dtn
|
||||
}
|
||||
|
||||
ibrcommon::BLOB::iostream stream = c._blob.iostream();
|
||||
- (*stream).seekp(obj.fragmentoffset.get<std::streampos>());
|
||||
+ (*stream).seekp(obj.fragmentoffset.get<std::streamoff>());
|
||||
|
||||
const dtn::data::PayloadBlock &p = obj.find<dtn::data::PayloadBlock>();
|
||||
const Length plength = p.getLength();
|
||||
diff --git a/ibrdtn/data/Dictionary.cpp b/ibrdtn/data/Dictionary.cpp
|
||||
index 6299e66f3..208f90488 100644
|
||||
--- a/ibrdtn/data/Dictionary.cpp
|
||||
+++ b/ibrdtn/data/Dictionary.cpp
|
||||
@@ -154,11 +154,11 @@ namespace dtn
|
||||
{
|
||||
char buffer[1024];
|
||||
|
||||
- _bytestream.seekg(scheme.get<std::streampos>());
|
||||
+ _bytestream.seekg(scheme.get<std::streamoff>());
|
||||
_bytestream.get(buffer, 1024, '\0');
|
||||
std::string scheme_str(buffer);
|
||||
|
||||
- _bytestream.seekg(ssp.get<std::streampos>());
|
||||
+ _bytestream.seekg(ssp.get<std::streamoff>());
|
||||
_bytestream.get(buffer, 1024, '\0');
|
||||
std::string ssp_str(buffer);
|
||||
|
||||
Reference in New Issue
Block a user