diff options
-rw-r--r-- | textproc/randlm/Makefile | 3 | ||||
-rw-r--r-- | textproc/randlm/files/patch-BitArray.cpp | 11 | ||||
-rw-r--r-- | textproc/randlm/files/patch-BloomMap.cpp | 11 | ||||
-rw-r--r-- | textproc/randlm/files/patch-LogFreqBloomFilter.cpp | 11 | ||||
-rw-r--r-- | textproc/randlm/files/patch-RandLM.cpp | 11 | ||||
-rw-r--r-- | textproc/randlm/files/patch-TableChunkLocator.h | 11 |
6 files changed, 56 insertions, 2 deletions
diff --git a/textproc/randlm/Makefile b/textproc/randlm/Makefile index b8457c1abb03..569ae77cb67e 100644 --- a/textproc/randlm/Makefile +++ b/textproc/randlm/Makefile @@ -3,7 +3,7 @@ PORTNAME= randlm PORTVERSION= 0.2.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME} @@ -16,7 +16,6 @@ RUN_DEPENDS= ${LOCALBASE}/include/google/sparse_hash_map:devel/sparsehash BROKEN_aarch64= fails to compile: invalid output constraint =a in assembler BROKEN_armv6= fails to compile: invalid output constraint =a in assembler -BROKEN_armv7= fails to compile: BloomMap.cpp:275:58: error: ordered comparison between pointer and zero ('int *' and 'int') BROKEN_powerpc64= fails to compile: 'itr' does not name a type GNU_CONFIGURE= yes diff --git a/textproc/randlm/files/patch-BitArray.cpp b/textproc/randlm/files/patch-BitArray.cpp new file mode 100644 index 000000000000..b97ecbc52d28 --- /dev/null +++ b/textproc/randlm/files/patch-BitArray.cpp @@ -0,0 +1,11 @@ +--- src/LDHT/BitArray.cpp.orig 2017-03-07 01:14:52 UTC ++++ src/LDHT/BitArray.cpp +@@ -115,7 +115,7 @@ uint64_t BitArray::getLength() { + } + + bool BitArray::validArrayIndex(uint64_t index) { +- if (index >= 0 && index <= getLength()) ++ if (index >= 1 && index <= getLength()) + return true; + else + return false; diff --git a/textproc/randlm/files/patch-BloomMap.cpp b/textproc/randlm/files/patch-BloomMap.cpp new file mode 100644 index 000000000000..cd141fe5f18d --- /dev/null +++ b/textproc/randlm/files/patch-BloomMap.cpp @@ -0,0 +1,11 @@ +--- src/RandLM/BloomMap.cpp.orig 2017-03-07 00:13:58 UTC ++++ src/RandLM/BloomMap.cpp +@@ -272,7 +272,7 @@ namespace randlm { + + bool BloomMap::computePaths() { + // determine the path lengths based on distribution for codes of each type +- assert(stats_counters_ && root_ == NULL && max_code_ > 0); ++ assert(stats_counters_ && root_ == NULL && max_code_ != NULL); + code_to_leaf_ = new uint64_t*[num_events_]; + code_to_path_len_ = new int*[num_events_]; + code_to_bound_ = new int*[num_events_]; diff --git a/textproc/randlm/files/patch-LogFreqBloomFilter.cpp b/textproc/randlm/files/patch-LogFreqBloomFilter.cpp new file mode 100644 index 000000000000..1145976c5e56 --- /dev/null +++ b/textproc/randlm/files/patch-LogFreqBloomFilter.cpp @@ -0,0 +1,11 @@ +--- src/RandLM/LogFreqBloomFilter.cpp.orig 2017-03-07 00:13:45 UTC ++++ src/RandLM/LogFreqBloomFilter.cpp +@@ -207,7 +207,7 @@ namespace randlm { + + int LogFreqBloomFilter::getMaxHashes(int event_idx) { + // simple for unary encoding +- assert(max_alpha_ > 0 && max_k_ > 0 && max_code_ > 0); ++ assert(max_alpha_ > 0 && max_k_ > 0 && max_code_ != NULL); + return max_alpha_ + (max_k_ * max_code_[event_idx]); + } + diff --git a/textproc/randlm/files/patch-RandLM.cpp b/textproc/randlm/files/patch-RandLM.cpp new file mode 100644 index 000000000000..e0b16fa7a910 --- /dev/null +++ b/textproc/randlm/files/patch-RandLM.cpp @@ -0,0 +1,11 @@ +--- src/RandLM/RandLM.cpp.orig 2017-03-07 02:01:18 UTC ++++ src/RandLM/RandLM.cpp +@@ -66,7 +66,7 @@ namespace randlm { + smoothing_name = kStupidBackoffSmoothing; + break; + case kWittenBellSmoothingCode: +- smoothing_name == kWittenBellSmoothing; ++ smoothing_name = kWittenBellSmoothing; + break; + case kBackoffSmoothingCode: + smoothing_name = kBackoffSmoothing; diff --git a/textproc/randlm/files/patch-TableChunkLocator.h b/textproc/randlm/files/patch-TableChunkLocator.h new file mode 100644 index 000000000000..a7c55fa8fd22 --- /dev/null +++ b/textproc/randlm/files/patch-TableChunkLocator.h @@ -0,0 +1,11 @@ +--- src/LDHT/TableChunkLocator.h.orig 2017-03-07 01:06:04 UTC ++++ src/LDHT/TableChunkLocator.h +@@ -21,7 +21,7 @@ public: + int num_cells, + int num_chunks) = 0; + virtual int locateTableChunkForKey(uint64_t key) = 0; +- ++ virtual ~TableChunkLocator(){}; + }; + + } // namespace LDHT. |