diff options
-rw-r--r-- | archivers/par2cmdline-tbb/files/patch-md5.h | 47 | ||||
-rw-r--r-- | archivers/par2cmdline-tbb/files/patch-par2cmdline.h | 11 |
2 files changed, 58 insertions, 0 deletions
diff --git a/archivers/par2cmdline-tbb/files/patch-md5.h b/archivers/par2cmdline-tbb/files/patch-md5.h new file mode 100644 index 000000000000..11d5313cca23 --- /dev/null +++ b/archivers/par2cmdline-tbb/files/patch-md5.h @@ -0,0 +1,47 @@ +--- md5.h.orig 2008-05-06 13:24:40.000000000 +0200 ++++ md5.h 2008-05-06 13:24:58.000000000 +0200 +@@ -38,11 +38,8 @@ + class MD5Hash + { + public: +- // removed this to stop GCC warnings about using the 'pack' attribute on +- // non-POD members in classes such as PACKET_HEADER: +- + // Constructor does not initialise the value +- //MD5Hash(void) {}; ++ MD5Hash(void) {}; + + // Comparison operators + bool operator==(const MD5Hash &other) const; +@@ -57,12 +54,9 @@ + friend ostream& operator<<(ostream &s, const MD5Hash &hash); + string print(void) const; + +- // removed these to stop GCC warnings about using the 'pack' attribute on +- // non-POD members in classes such as PACKET_HEADER: +- + // Copy and assignment +- //MD5Hash(const MD5Hash &other); +- //MD5Hash& operator=(const MD5Hash &other); ++ MD5Hash(const MD5Hash &other); ++ MD5Hash& operator=(const MD5Hash &other); + + public: + u8 hash[16]; // 16 byte MD5 Hash value +@@ -150,7 +144,7 @@ + return !other.operator<(*this); + } + +-/*inline MD5Hash::MD5Hash(const MD5Hash &other) ++inline MD5Hash::MD5Hash(const MD5Hash &other) + { + memcpy(&hash, &other.hash, sizeof(hash)); + } +@@ -160,6 +154,6 @@ + memcpy(&hash, &other.hash, sizeof(hash)); + + return *this; +-}*/ ++} + + #endif // __MD5_H__ diff --git a/archivers/par2cmdline-tbb/files/patch-par2cmdline.h b/archivers/par2cmdline-tbb/files/patch-par2cmdline.h new file mode 100644 index 000000000000..44f922adc3a5 --- /dev/null +++ b/archivers/par2cmdline-tbb/files/patch-par2cmdline.h @@ -0,0 +1,11 @@ +--- par2cmdline.h.orig 2008-05-01 08:53:49.729467641 +0200 ++++ par2cmdline.h 2008-05-01 08:54:02.616707220 +0200 +@@ -443,7 +443,7 @@ + incrementing_parallel_while_with_max> >& w, + ITEM* item) + { +- const size_t n = item->is_first() ? tbb::DetectNumberOfWorkers() : 1; ++ const size_t n = item->is_first() ? tbb::internal::DetectNumberOfWorkers() : 1; + + bool res = false; + std::pair<bool, size_t> pr(w.increment_next_i()); |