File aria2-1.14.2-gcc47.patch of Package aria2

Overview Repositories Revisions Requests Users Attributes Meta

File aria2-1.14.2-gcc47.patch of Package aria2 (Revision 3fb3668f4227ab573187dbe72ce9b880)

Currently displaying revision 3fb3668f4227ab573187dbe72ce9b880 , Show latest

Index: src/util.h
===================================================================
--- src/util.h.orig	2012-02-27 13:58:33.000000000 +0100
+++ src/util.h	2012-03-20 22:34:26.039899602 +0100
@@ -111,48 +111,6 @@ std::string nativeToUtf8(const std::stri
 
 namespace util {
 
-template<typename InputIterator>
-void divide
-(std::pair<std::pair<InputIterator, InputIterator>,
-           std::pair<InputIterator, InputIterator> >& hp,
- InputIterator first,
- InputIterator last,
- char delim)
-{
-  InputIterator dpos = std::find(first, last, delim);
-  if(dpos == last) {
-    hp.first = stripIter(first, last);
-    hp.second.first = hp.second.second;
-  } else {
-    hp.first = stripIter(first, dpos);
-    hp.second = stripIter(dpos+1, last);
-  }
-}
-
-template<typename T>
-std::string uitos(T value, bool comma = false)
-{
-  std::string str;
-  if(value == 0) {
-    str = "0";
-    return str;
-  }
-  int count = 0;
-  while(value) {
-    ++count;
-    char digit = value%10+'0';
-    if(comma && count > 3 && count%3 == 1) {
-      str += ",";
-    }
-    str += digit;
-    value /= 10;
-  }
-  std::reverse(str.begin(), str.end());
-  return str;
-}
-
-std::string itos(int64_t value, bool comma = false);
-
 /**
  * Computes difference in micro-seconds between tv1 and tv2,
  * assuming tv1 is newer than tv2.
@@ -204,6 +162,48 @@ InputIterator lstripIter
                     DEFAULT_STRIP_CHARSET.begin(), DEFAULT_STRIP_CHARSET.end());
 }
 
+template<typename InputIterator>
+void divide
+(std::pair<std::pair<InputIterator, InputIterator>,
+           std::pair<InputIterator, InputIterator> >& hp,
+ InputIterator first,
+ InputIterator last,
+ char delim)
+{
+  InputIterator dpos = std::find(first, last, delim);
+  if(dpos == last) {
+    hp.first = stripIter(first, last);
+    hp.second.first = hp.second.second;
+  } else {
+    hp.first = stripIter(first, dpos);
+    hp.second = stripIter(dpos+1, last);
+  }
+}
+
+template<typename T>
+std::string uitos(T value, bool comma = false)
+{
+  std::string str;
+  if(value == 0) {
+    str = "0";
+    return str;
+  }
+  int count = 0;
+  while(value) {
+    ++count;
+    char digit = value%10+'0';
+    if(comma && count > 3 && count%3 == 1) {
+      str += ",";
+    }
+    str += digit;
+    value /= 10;
+  }
+  std::reverse(str.begin(), str.end());
+  return str;
+}
+
+std::string itos(int64_t value, bool comma = false);
+
 std::string strip
 (const std::string& str, const std::string& chars = DEFAULT_STRIP_CHARSET);
 
Index: src/common.h
===================================================================
--- src/common.h.orig	2011-10-25 15:45:06.000000000 +0200
+++ src/common.h	2012-03-20 22:37:02.074961079 +0100
@@ -86,5 +86,6 @@ typedef _off_t off_t;
 #define __STDC_LIMIT_MACROS
 // included here for compatibility issues with old compiler/libraries.
 #include <stdint.h>
-
+// ssize_t req gcc 4.7
+#include<sys/types.h>
 #endif // D_COMMON_H

Places

File aria2-1.14.2-gcc47.patch of Package aria2 (Revision 3fb3668f4227ab573187dbe72ce9b880)

Places