From ada303970732f00e2d3017b726effad65d27a4d2 Mon Sep 17 00:00:00 2001
From: Antony Woods <acron1@gmail.com>
Date: Wed, 22 Oct 2014 09:40:33 +0100
Subject: Fixed compiler errors and inlines some of the qs_parse functions

---
 include/logging.h      |  4 ++--
 include/query_string.h | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/logging.h b/include/logging.h
index ad1f4bc..0d77071 100644
--- a/include/logging.h
+++ b/include/logging.h
@@ -28,7 +28,7 @@ namespace crow
     class CerrLogHandler : public ILogHandler {
         public:
             void log(std::string message, LogLevel level) override {
-                cerr << message;
+                std::cerr << message;
             }
     };
 
@@ -56,7 +56,7 @@ namespace crow
             ~logger() {
     #ifdef CROW_ENABLE_LOGGING
                 if(level_ >= get_current_log_level()) {
-                    stringstream_ << endl;
+                    stringstream_ << std::endl;
                     get_handler_ref()->log(stringstream_.str(), level_);
                 }
     #endif
diff --git a/include/query_string.h b/include/query_string.h
index afc112e..2d53ea0 100644
--- a/include/query_string.h
+++ b/include/query_string.h
@@ -41,7 +41,7 @@ char * qs_scanvalue(const char * key, const char * qs, char * val, size_t val_le
 #define HEX2DEC(x)  (((x)>='0'&&(x)<='9') ? (x)-48 : ((x)>='A'&&(x)<='F') ? (x)-55 : ((x)>='a'&&(x)<='f') ? (x)-87 : 0)
 #define ISQSCHR(x) ((((x)=='=')||((x)=='#')||((x)=='&')||((x)=='\0')) ? 0 : 1)
 
-int qs_strncmp(const char * s, const char * qs, register size_t n)
+inline int qs_strncmp(const char * s, const char * qs, register size_t n)
 {
     int i=0;
     register unsigned char u1, u2, unyb, lnyb;
@@ -89,7 +89,7 @@ int qs_strncmp(const char * s, const char * qs, register size_t n)
 }
 
 
-int qs_parse(char * qs, char * qs_kv[], int qs_kv_size)
+inline int qs_parse(char * qs, char * qs_kv[], int qs_kv_size)
 {
     int i, j;
     char * substr_ptr;
@@ -132,7 +132,7 @@ int qs_parse(char * qs, char * qs_kv[], int qs_kv_size)
 }
 
 
-int qs_decode(char * qs)
+inline int qs_decode(char * qs)
 {
     int i=0, j=0;
 
@@ -161,7 +161,7 @@ int qs_decode(char * qs)
 }
 
 
-char * qs_k2v(const char * key, char * const * qs_kv, int qs_kv_size, int nth = 0)
+inline char * qs_k2v(const char * key, char * const * qs_kv, int qs_kv_size, int nth = 0)
 {
     int i;
     size_t key_len, skip;
@@ -192,7 +192,7 @@ char * qs_k2v(const char * key, char * const * qs_kv, int qs_kv_size, int nth =
 }
 
 
-char * qs_scanvalue(const char * key, const char * qs, char * val, size_t val_len)
+inline char * qs_scanvalue(const char * key, const char * qs, char * val, size_t val_len)
 {
     size_t i, key_len;
     const char * tmp;
@@ -257,7 +257,7 @@ namespace crow
             _url[0] = 0;
         }
 
-        friend ostream& operator<<(ostream& os, const query_string& qs)
+        friend std::ostream& operator<<(std::ostream& os, const query_string& qs)
         {
             os << "[ ";
             for(int i = 0; i < qs._kv_size; ++i) {
@@ -277,9 +277,9 @@ namespace crow
             return ret != 0 ? ret : nullptr;
         }
 
-        vector<char*> get_list (const std::string name) const
+        std::vector<char*> get_list (const std::string name) const
         {
-            vector<char*> ret;
+            std::vector<char*> ret;
             std::string plus = name + "[]";            
             char* tmp = nullptr;
             int count = 0;
-- 
cgit v1.2.3-54-g00ecf