Merge pull request #105 from sergey-shambir/curl_global_cleanup

Author: JosephP91

include/curl_global.h

@@ -46,33 +46,20 @@ namespace curl {
          * with user specified flag.
          */
         explicit curl_global(const long);
+
+        /**
+          * Copying disabled to follow RAII idiom.
+          */
+        curl_global(const curl_global&) = delete;
+        curl_global& operator=(const curl_global&) = delete;
+
         /**
          * The virtual destructor will provide an easy and clean
          * way to deallocate resources, closing curl environment
          * correctly.
          */
         virtual ~curl_global();
     };
-    
-    // Implementation of constructor.
-    curl_global::curl_global() {
-        const CURLcode code = curl_global_init(CURL_GLOBAL_ALL);
-        if (code != CURLE_OK) {
-            throw curl_easy_exception(code,__FUNCTION__);
-        }
-    }
-    
-    // Implementation of overloaded constructor.
-    curl_global::curl_global(const long flag) {
-        const CURLcode code = curl_global_init(flag);
-        if (code != CURLE_OK) {
-            throw curl_easy_exception(code,__FUNCTION__);
-        }
-    }
-    
-    // Implementation of the virtual destructor.
-    curl_global::~curl_global() {
-    }
 }
 
 #endif	/* defined(__curlcpp__curl_global__) */

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(CURLCPP_SOURCE
   curl_easy.cpp
   curl_header.cpp
+  curl_global.cpp
   curl_form.cpp
   curl_multi.cpp
   curl_share.cpp

src/curl_global.cpp

@@ -0,0 +1,24 @@
+#include "curl_global.h"
+
+using curl::curl_global;
+
+curl_global::curl_global()
+{
+    const CURLcode code = curl_global_init(CURL_GLOBAL_ALL);
+    if (code != CURLE_OK) {
+        throw curl_easy_exception(code, __FUNCTION__);
+    }
+}
+
+curl_global::curl_global(const long flag)
+{
+    const CURLcode code = curl_global_init(flag);
+    if (code != CURLE_OK) {
+        throw curl_easy_exception(code, __FUNCTION__);
+    }
+}
+
+curl_global::~curl_global()
+{
+    curl_global_cleanup();
+}