Fixed compiler errors and inlines some of the qs_parse functions

1 files changed, 18 insertions, 22 deletions

diff --git a/amalgamate/crow_all.h b/amalgamate/crow_all.h
index 43a3af4..743eb52 100644
--- a/amalgamate/crow_all.h
+++ b/amalgamate/crow_all.h
@@ -327,8 +327,6 @@ template <typename F, typename Set>
 #include <stdio.h>
 #include <string>
 
-using namespace std;
-
 // ----------------------------------------------------------------------------
 // qs_parse (modified)
 // https://github.com/bartgrantham/qs_parse
@@ -367,7 +365,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;
@@ -415,7 +413,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;
@@ -458,7 +456,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;
 
@@ -487,7 +485,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;
@@ -518,7 +516,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;
@@ -583,7 +581,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) {
@@ -597,16 +595,16 @@ namespace crow
 
         }
 
-        char* get (const string name) const
+        char* get (const std::string name) const
         {
             char* ret = qs_k2v(name.c_str(), _kv_pairs, _kv_size);
             return ret != 0 ? ret : nullptr;
         }
 
-        vector<char*> get_list (const string name) const
+        std::vector<char*> get_list (const std::string name) const
         {
-            vector<char*> ret;
-            string plus = name + "[]";            
+            std::vector<char*> ret;
+            std::string plus = name + "[]";            
             char* tmp = nullptr;
             int count = 0;
             do
@@ -702,8 +700,6 @@ namespace crow
 
 
 
-using namespace std;
-
 namespace crow
 {
     enum class LogLevel
@@ -717,13 +713,13 @@ namespace crow
 
     class ILogHandler {
         public:
-            virtual void log(string message, LogLevel level) = 0;
+            virtual void log(std::string message, LogLevel level) = 0;
     };
 
     class CerrLogHandler : public ILogHandler {
         public:
-            void log(string message, LogLevel level) override {
-                cerr << message;
+            void log(std::string message, LogLevel level) override {
+                std::cerr << message;
             }
     };
 
@@ -731,18 +727,18 @@ namespace crow
 
         private:
             //
-            static string timestamp()
+            static std::string timestamp()
             {
                 char date[32];
                   time_t t = time(0);
                   strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", gmtime(&t));
-                  return string(date);
+                  return std::string(date);
             }
 
         public:
 
 
-            logger(string prefix, LogLevel level) : level_(level) {
+            logger(std::string prefix, LogLevel level) : level_(level) {
     #ifdef CROW_ENABLE_LOGGING
                     stringstream_ << "(" << timestamp() << ") [" << prefix << "] ";
     #endif
@@ -751,7 +747,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
@@ -797,7 +793,7 @@ namespace crow
             }
 
             //
-            ostringstream stringstream_;
+            std::ostringstream stringstream_;
             LogLevel level_;
     };
 }