View | Details | Raw Unified | Return to bug 123286 | Differences between
and this patch

Collapse All | Expand All

(-)par2cmdline-tbb/files/patch-md5.h (+47 lines)
Line 0 Link Here
1
--- md5.h.orig	2008-05-06 13:24:40.000000000 +0200
2
+++ md5.h	2008-05-06 13:24:58.000000000 +0200
3
@@ -38,11 +38,8 @@
4
 class MD5Hash
5
 {
6
 public:
7
-  // removed this to stop GCC warnings about using the 'pack' attribute on
8
-  // non-POD members in classes such as PACKET_HEADER:
9
-
10
   // Constructor does not initialise the value
11
-  //MD5Hash(void) {};
12
+  MD5Hash(void) {};
13
 
14
   // Comparison operators
15
   bool operator==(const MD5Hash &other) const;
16
@@ -57,12 +54,9 @@
17
   friend ostream& operator<<(ostream &s, const MD5Hash &hash);
18
   string print(void) const;
19
 
20
-  // removed these to stop GCC warnings about using the 'pack' attribute on
21
-  // non-POD members in classes such as PACKET_HEADER:
22
-
23
   // Copy and assignment
24
-  //MD5Hash(const MD5Hash &other);
25
-  //MD5Hash& operator=(const MD5Hash &other);
26
+  MD5Hash(const MD5Hash &other);
27
+  MD5Hash& operator=(const MD5Hash &other);
28
 
29
 public:
30
   u8 hash[16]; // 16 byte MD5 Hash value
31
@@ -150,7 +144,7 @@
32
   return !other.operator<(*this);
33
 }
34
 
35
-/*inline MD5Hash::MD5Hash(const MD5Hash &other)
36
+inline MD5Hash::MD5Hash(const MD5Hash &other)
37
 {
38
   memcpy(&hash, &other.hash, sizeof(hash));
39
 }
40
@@ -160,6 +154,6 @@
41
   memcpy(&hash, &other.hash, sizeof(hash));
42
 
43
   return *this;
44
-}*/
45
+}
46
 
47
 #endif // __MD5_H__

Return to bug 123286