Branch 'libkolabxml-0.7' - src/uriencode.cpp

Christian Mollekopf mollekopf at kolabsys.com
Wed Jul 25 11:05:06 CEST 2012


 src/uriencode.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8678445bd6cadbd5bfebc8d7de03e83ca1c68234
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Jul 20 12:06:29 2012 +0200

    fix build without -fpermissive
    (cherry picked from commit 8f8a2f3b9f3d227a60f1a733476b13c60a352e21)

diff --git a/src/uriencode.cpp b/src/uriencode.cpp
index 363f98e..3c30331 100644
--- a/src/uriencode.cpp
+++ b/src/uriencode.cpp
@@ -21,7 +21,7 @@
 std::string uriEncode(const std::string &s)
 {
     CURL *easyhandle = curl_easy_init();
-    const char *result = curl_easy_escape(easyhandle, s.c_str(), s.length());
+    char *result = curl_easy_escape(easyhandle, s.c_str(), static_cast<int>(s.length()));
     curl_easy_cleanup(easyhandle);
     if (!result) {
         return std::string();
@@ -35,7 +35,7 @@ std::string uriDecode(const std::string &s)
 {
     CURL *easyhandle = curl_easy_init();
     int length = 0;
-    const char *result = curl_easy_unescape(easyhandle, s.c_str(), s.length(), &length);
+    char *result = curl_easy_unescape(easyhandle, s.c_str(), static_cast<int>(s.length()), &length);
     curl_easy_cleanup(easyhandle);
     if (!length) {
         return std::string();





More information about the commits mailing list