You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

41 lines
1.4 KiB

  1. From 1395d849d73147319ee422d2ce34de0bcb90e6f8 Mon Sep 17 00:00:00 2001
  2. From: Johannes Morgenroth <jm@m-network.de>
  3. Date: Thu, 3 Jan 2019 07:34:14 +0100
  4. Subject: [PATCH] Use std::streamoff instead of std::streampos
  5. ---
  6. ibrdtn/data/BundleMerger.cpp | 2 +-
  7. ibrdtn/data/Dictionary.cpp | 4 ++--
  8. 2 files changed, 3 insertions(+), 3 deletions(-)
  9. diff --git a/ibrdtn/data/BundleMerger.cpp b/ibrdtn/data/BundleMerger.cpp
  10. index 1cd20c522..b71a0849b 100644
  11. --- a/ibrdtn/data/BundleMerger.cpp
  12. +++ b/ibrdtn/data/BundleMerger.cpp
  13. @@ -119,7 +119,7 @@ namespace dtn
  14. }
  15. ibrcommon::BLOB::iostream stream = c._blob.iostream();
  16. - (*stream).seekp(obj.fragmentoffset.get<std::streampos>());
  17. + (*stream).seekp(obj.fragmentoffset.get<std::streamoff>());
  18. const dtn::data::PayloadBlock &p = obj.find<dtn::data::PayloadBlock>();
  19. const Length plength = p.getLength();
  20. diff --git a/ibrdtn/data/Dictionary.cpp b/ibrdtn/data/Dictionary.cpp
  21. index 6299e66f3..208f90488 100644
  22. --- a/ibrdtn/data/Dictionary.cpp
  23. +++ b/ibrdtn/data/Dictionary.cpp
  24. @@ -154,11 +154,11 @@ namespace dtn
  25. {
  26. char buffer[1024];
  27. - _bytestream.seekg(scheme.get<std::streampos>());
  28. + _bytestream.seekg(scheme.get<std::streamoff>());
  29. _bytestream.get(buffer, 1024, '\0');
  30. std::string scheme_str(buffer);
  31. - _bytestream.seekg(ssp.get<std::streampos>());
  32. + _bytestream.seekg(ssp.get<std::streamoff>());
  33. _bytestream.get(buffer, 1024, '\0');
  34. std::string ssp_str(buffer);