Moving tokenize, percentEncode and percentDecode around. Fixing a few warnings. Workarounding c-ares and pthreads compilation issue with unicode.

3 files changed, 5 insertions, 5 deletions

diff --git a/includes/BString.h b/includes/BString.h
index 0a5fceb..dc9fd5d 100644
--- a/includes/BString.h
+++ b/includes/BString.h
@@ -134,6 +134,9 @@ class String : private std::string {
 
     bool isEmpty() { return std::string::empty(); }
 
+    std::vector<String> tokenize(const String & delimiters = "&", bool trimEmpty = true);
+
+
     using std::string::npos;
     using std::string::size_type;
 };
diff --git a/includes/CurlTask.h b/includes/CurlTask.h
index f1aba65..c5c085c 100644
--- a/includes/CurlTask.h
+++ b/includes/CurlTask.h
@@ -12,10 +12,6 @@ class CurlTask : public StacklessTask {
       virtual ~CurlTask();
     friend class TaskMan;
   
-    static String percentEncode(const String & src);
-    static String percentDecode(const String & src);
-    static std::vector<String> tokenize(const String & str, const String & delimiters = "&", bool trimEmpty = true);
-
     virtual void prepareRequest() { }
 
   protected:
diff --git a/includes/Http.h b/includes/Http.h
index f0651f7..58edd23 100644
--- a/includes/Http.h
+++ b/includes/Http.h
@@ -15,8 +15,9 @@ namespace Balau {
 namespace Http {
 
 const char * getStatusMsg(int httpStatus);
-
 const char * getContentType(const String & extension);
+String percentEncode(const String & src);
+String percentDecode(const String & src);
 
 typedef std::map<String, String> StringMap;
 typedef std::multimap<String, String> StringMultiMap;