[Libreoffice-commits] libmspub.git: src/lib

Richard PALO richard at NetBSD.org
Mon Feb 16 03:46:06 PST 2015


 src/lib/MSPUBMetaData.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db5a1e5b20463fc5704c53aa679e17e875314da2
Author: Richard PALO <richard at NetBSD.org>
Date:   Fri Feb 13 17:16:59 2015 +0100

    use std::pow in order to avoid compile time errors like:
    error: call of overloaded 'pow(int, uint16_t&)' is ambiguous
    
    as seen on SunOS 5.11
    
    Change-Id: I0e0bcdf4c50f9c8d1e8f088193eac82247178e80
    Reviewed-on: https://gerrit.libreoffice.org/14478
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index 7e5888e..1234fe2 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -194,7 +194,7 @@ bool libmspub::MSPUBMetaData::parseTimes(librevenge::RVNGInputStream *input)
   uint32_t firstDirSectorLocation = readU32(input);
 
   // Seek to the Root Directory Entry
-  size_t sectorSize = pow(2, sectorShift);
+  size_t sectorSize = std::pow(2, sectorShift);
   input->seek((firstDirSectorLocation + 1) * sectorSize, librevenge::RVNG_SEEK_SET);
   // DirectoryEntryName: 64 bytes
   // DirectoryEntryNameLength: 2 bytes


More information about the Libreoffice-commits mailing list