Attachment 86788 Details for Bug 123286 – patch-par2cmdline-tbb.txt

[patch] patch-par2cmdline-tbb.txt

patch-par2cmdline-tbb.txt (text/plain), 1.52 KB, created by Ganael LAPLANCHE on 2008-05-06 18:17:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2008-05-06 18:17:47 UTC

Size: 1.52 KB

patch

obsolete

>diff -aurN par2cmdline-tbb.orig/files/patch-md5.h par2cmdline-tbb/files/patch-md5.h
>--- par2cmdline-tbb.orig/files/patch-md5.h	1970-01-01 01:00:00.000000000 +0100
>+++ par2cmdline-tbb/files/patch-md5.h	2008-05-06 18:45:58.543049822 +0200
>@@ -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__

Actions: View | Diff

Attachments on bug 123286: 86787 | 86788