[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b030a4d

The following commit has been merged in the master branch:
commit b030a4de7c4c788e21a8cbf007659c344b2ba831
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Aug 25 03:13:21 2015 +0000

    #1077: Removed msync() calls from MemIo.
---
 include/exiv2/basicio.hpp |  1 -
 src/basicio.cpp           | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp
index 8705c99..a118770 100644
--- a/include/exiv2/basicio.hpp
+++ b/include/exiv2/basicio.hpp
@@ -702,7 +702,6 @@ namespace Exiv2 {
          */
         virtual byte* mmap(bool /*isWriteable*/ =false);
         virtual int munmap();
-        int msync();
         //@}
 
         //! @name Accessors
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 143671b..958a822 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -1174,7 +1174,6 @@ namespace Exiv2 {
     MemIo::~MemIo()
     {
         if (p_->isMalloced_) {
-            msync();
             std::free(p_->data_);
         }
         delete p_;
@@ -1200,7 +1199,6 @@ namespace Exiv2 {
         if (memIo) {
             // Optimization if src is another instance of MemIo
             if (p_->isMalloced_) {
-				msync();
                 std::free(p_->data_);
             }
             p_->idx_ = 0;
@@ -1288,16 +1286,7 @@ namespace Exiv2 {
 
     int MemIo::munmap()
     {
-        return msync();
-    }
-
-    int MemIo::msync()
-    {
-#ifdef MS_SYNC
-        return ::msync(p_, p_->size_, MS_SYNC);
-#else
         return 0;
-#endif
     }
 
     long MemIo::tell() const

-- 
exiv2 packaging