diff options
Diffstat (limited to '')
-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 | ||||
-rw-r--r-- | textproc/randlm/files/patch-src-LDHT-MurmurHash3.cpp | 11 | ||||
-rw-r--r-- | textproc/randlm/files/patch-src-LDHT-Util.h | 31 | ||||
-rw-r--r-- | textproc/randlm/files/patch-src-RandLM-LogFreqSketch.cpp | 20 | ||||
-rw-r--r-- | textproc/randlm/files/patch-src-RandLM-RandLMFilter.h | 34 | ||||
-rw-r--r-- | textproc/randlm/files/patch-src-RandLM-RandLMTypes.h | 11 |
10 files changed, 0 insertions, 162 deletions
diff --git a/textproc/randlm/files/patch-BitArray.cpp b/textproc/randlm/files/patch-BitArray.cpp deleted file mode 100644 index b97ecbc52d28..000000000000 --- a/textproc/randlm/files/patch-BitArray.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index cd141fe5f18d..000000000000 --- a/textproc/randlm/files/patch-BloomMap.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 1145976c5e56..000000000000 --- a/textproc/randlm/files/patch-LogFreqBloomFilter.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index e0b16fa7a910..000000000000 --- a/textproc/randlm/files/patch-RandLM.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index a7c55fa8fd22..000000000000 --- a/textproc/randlm/files/patch-TableChunkLocator.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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. diff --git a/textproc/randlm/files/patch-src-LDHT-MurmurHash3.cpp b/textproc/randlm/files/patch-src-LDHT-MurmurHash3.cpp deleted file mode 100644 index fc55279b2917..000000000000 --- a/textproc/randlm/files/patch-src-LDHT-MurmurHash3.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/LDHT/MurmurHash3.cpp.bak 2012-03-30 14:53:05.000000000 +0400 -+++ ./src/LDHT/MurmurHash3.cpp 2014-08-30 17:56:33.000000000 +0400 -@@ -29,7 +29,7 @@ - - #else // defined(_MSC_VER) - --#define FORCE_INLINE __attribute__((always_inline)) -+#define FORCE_INLINE inline __attribute__((always_inline)) - - inline uint32_t rotl32 ( uint32_t x, int8_t r ) - { diff --git a/textproc/randlm/files/patch-src-LDHT-Util.h b/textproc/randlm/files/patch-src-LDHT-Util.h deleted file mode 100644 index c3eb320265ef..000000000000 --- a/textproc/randlm/files/patch-src-LDHT-Util.h +++ /dev/null @@ -1,31 +0,0 @@ ---- src/LDHT/Util.h.orig 2012-03-30 10:53:05 UTC -+++ src/LDHT/Util.h -@@ -10,6 +10,10 @@ - #include <cstdlib> - #include <cstring> - #include <stdint.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> - - #define V(expr) std::cerr << __FILE__ << ":" \ - << __LINE__ << " " \ -@@ -43,6 +47,9 @@ class Util { (public) - static uint64_t hash(uint64_t a, uint64_t b, uint64_t P, uint8_t* e); - static uint64_t hash(uint64_t a, uint64_t b, uint64_t P, uint64_t e); - static inline uint64_t rdtsc() { -+#if defined(__powerpc__) -+ return __builtin_readcyclecounter(); -+#else - uint32_t lo, hi; - __asm__ __volatile__( - "xorl %%eax,%%eax\n" -@@ -52,6 +59,7 @@ class Util { (public) - : - : "%ebx", "%ecx"); - return static_cast<uint64_t>(hi) << 32 | lo; -+#endif - }; - }; - diff --git a/textproc/randlm/files/patch-src-RandLM-LogFreqSketch.cpp b/textproc/randlm/files/patch-src-RandLM-LogFreqSketch.cpp deleted file mode 100644 index 7665b3731725..000000000000 --- a/textproc/randlm/files/patch-src-RandLM-LogFreqSketch.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/RandLM/LogFreqSketch.cpp.orig 2012-03-30 13:53:30.000000000 +0400 -+++ src/RandLM/LogFreqSketch.cpp 2014-09-01 18:22:05.000000000 +0400 -@@ -162,7 +162,7 @@ namespace randlm { - - bool LogFreqSketch::load(RandLMFile* fin) { - // just maximum m -- return fin->read((char*)&maximum_m_, sizeof(maximum_m_));; -+ return fin->read((char*)&maximum_m_, sizeof(maximum_m_)).good(); - } - - bool LogFreqSketch::save(RandLMFile* fout) { -@@ -170,7 +170,7 @@ namespace randlm { - assert(LogFreqBloomFilter::save(fout)); // saves RandLMStruct first - assert(OnlineRandLMStruct::save(fout)); - // just maximum m -- return fout->write((char*)&maximum_m_, sizeof(maximum_m_));; -+ return fout->write((char*)&maximum_m_, sizeof(maximum_m_)).good(); - } - - } diff --git a/textproc/randlm/files/patch-src-RandLM-RandLMFilter.h b/textproc/randlm/files/patch-src-RandLM-RandLMFilter.h deleted file mode 100644 index da03cccc4618..000000000000 --- a/textproc/randlm/files/patch-src-RandLM-RandLMFilter.h +++ /dev/null @@ -1,34 +0,0 @@ ---- src/RandLM/RandLMFilter.h.orig 2014-09-01 18:07:56.000000000 +0400 -+++ src/RandLM/RandLMFilter.h 2014-09-01 18:08:39.000000000 +0400 -@@ -289,7 +289,7 @@ namespace randlm { - std::cerr << "Saved ResizedBitFilter. Rho = " << rho() << "." << std::endl; - assert(fout->write((char*)&old_addresses_, sizeof(old_addresses_))); - assert(fout->write((char*)&a_, sizeof(a_))); -- return fout->write((char*)&b_, sizeof(b_)); -+ return fout->write((char*)&b_, sizeof(b_)).good(); - } - protected: - bool load(RandLMFile* fin) { -@@ -297,7 +297,7 @@ namespace randlm { - std::cerr << "Loaded ResizedBitFilter. Rho = " << rho() << "." << std::endl; - assert(fin->read((char*)&old_addresses_, sizeof(old_addresses_))); - assert(fin->read((char*)&a_, sizeof(a_))); -- return fin->read((char*)&b_, sizeof(b_)); -+ return fin->read((char*)&b_, sizeof(b_)).good(); - } - // member data - uint64_t old_addresses_; // size of pre-resized filter -@@ -342,11 +342,11 @@ namespace randlm { - } - bool save(RandLMFile* fout) { - assert(Filter<T>::save(fout)); -- return fout->write((char*)&wrap_around_, sizeof(wrap_around_)); -+ return fout->write((char*)&wrap_around_, sizeof(wrap_around_)).good(); - } - private: - bool load(RandLMFile* fin) { -- return fin->read((char*)&wrap_around_, sizeof(wrap_around_)); -+ return fin->read((char*)&wrap_around_, sizeof(wrap_around_)).good(); - } - inline bool incrementSubCell(int bit, int len, T* cell) { - // increment counter consisting of bits [startbit, startbit + len - 1] rest stays unchanged diff --git a/textproc/randlm/files/patch-src-RandLM-RandLMTypes.h b/textproc/randlm/files/patch-src-RandLM-RandLMTypes.h deleted file mode 100644 index 8302256066c6..000000000000 --- a/textproc/randlm/files/patch-src-RandLM-RandLMTypes.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/RandLM/RandLMTypes.h.orig 2014-09-01 18:20:25.000000000 +0400 -+++ src/RandLM/RandLMTypes.h 2014-09-01 18:21:06.000000000 +0400 -@@ -21,7 +21,7 @@ - #include <string> - #include <stdint.h> - --#define iterate(c,i) for(typeof(c.begin()) i = c.begin(); i != c.end(); i++) -+#define iterate(c,i) for(auto i = c.begin(); i != c.end(); i++) - - namespace randlm { - |