Merge pull request #17 from lucklove/master

move two include instructions to source file to avoid macro pollution
mrtazz · Jul 11, 2015 · c300091 · c300091
2 parents d3eb0cf + 504f6fc
commit c300091
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/restclient-cpp/restclient.h b/include/restclient-cpp/restclient.h
@@ -9,11 +9,9 @@
 #ifndef INCLUDE_RESTCLIENT_H_
 #define INCLUDE_RESTCLIENT_H_
 
-#include <curl/curl.h>
 #include <string>
 #include <map>
 #include <cstdlib>
-#include "meta.h"
 #include <algorithm>
 
 class RestClient

diff --git a/source/restclient.cpp b/source/restclient.cpp
@@ -8,7 +8,9 @@
          INCLUDES
   ========================*/
 #include "restclient-cpp/restclient.h"
+#include "restclient-cpp/meta.h"
 
+#include <curl/curl.h>
 #include <cstring>
 #include <string>
 #include <iostream>