diff options
| author | richard <richard@pkgsrc.org> | 2015-08-25 08:15:18 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2015-08-25 08:15:18 +0000 |
| commit | 7037244d9daa38dbdf4ac383c7d74299dfc895aa (patch) | |
| tree | 5db1d17892bfa2c26808cb5d95249451c683da76 /converters | |
| parent | 4fa1b4cf7e04f4ab74bb55ee9ba8269df887aceb (diff) | |
| download | pkgsrc-7037244d9daa38dbdf4ac383c7d74299dfc895aa.tar.gz | |
use std::pow in order to avoid being ambiguous (on SunOS anyway)
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libmspub/distinfo | 3 | ||||
| -rw-r--r-- | converters/libmspub/patches/patch-src_lib_MSPUBMetaData.cpp | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/converters/libmspub/distinfo b/converters/libmspub/distinfo index 14073461811..7df7d5f1778 100644 --- a/converters/libmspub/distinfo +++ b/converters/libmspub/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2015/01/04 23:30:21 wiz Exp $ +$NetBSD: distinfo,v 1.4 2015/08/25 08:15:18 richard Exp $ SHA1 (libmspub-0.1.2.tar.xz) = e1bab3a4be9215b69700dcdb81cf27e194097776 RMD160 (libmspub-0.1.2.tar.xz) = d7b57b74503fab484d694042af109febaec57bb4 Size (libmspub-0.1.2.tar.xz) = 345556 bytes SHA1 (patch-configure) = 6e06700444a6dbde7a34de9df96b37291a9a6830 +SHA1 (patch-src_lib_MSPUBMetaData.cpp) = bdc6f44f44a2cc059b6918d742d8d184c707571f diff --git a/converters/libmspub/patches/patch-src_lib_MSPUBMetaData.cpp b/converters/libmspub/patches/patch-src_lib_MSPUBMetaData.cpp new file mode 100644 index 00000000000..0f5ee7d8676 --- /dev/null +++ b/converters/libmspub/patches/patch-src_lib_MSPUBMetaData.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-src_lib_MSPUBMetaData.cpp,v 1.1 2015/08/25 08:15:18 richard Exp $ +use std::pow in order to avoid: +call of overloaded 'pow(int, uint16_t&)' is ambiguous + +--- src/lib/MSPUBMetaData.cpp.orig 2014-12-30 11:42:44.000000000 +0000 ++++ src/lib/MSPUBMetaData.cpp +@@ -194,7 +194,7 @@ bool libmspub::MSPUBMetaData::parseTimes + 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 |