Revert "Revert "Migrate to openssl 1.1""

[platform/core/uifw/dali-adaptor.git] / dali / internal / imaging / common / file-download.h

diff --git a/dali/internal/imaging/common/file-download.h b/dali/internal/imaging/common/file-download.h
old mode 100644 (file)
new mode 100755 (executable)
index 961e431..d53438c
--- a/dali/internal/imaging/common/file-download.h
+++ b/dali/internal/imaging/common/file-download.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H__
-#define __DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H__
+#ifndef DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H
+#define DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,27 +52,12 @@ public:
    */
   ~CurlEnvironment();
 
-  /**
-   * Locking function for libcurl with openssl
-   */
-  static void OnOpenSSLLocking( int mode, int n, const char* file, int line );
-
-  /**
-   * Gets thread id for libcurl with openssl
-   */
-  static unsigned long GetThreadId();
-
-  static void ConfigureCurlOptions( void* curlHandle, const std::string& url );
-
-  static void InitWriteFunction( void* curlHandle );
-
-private:
-
-  void SetLockingFunction();
-
-  void UnsetLockingFunction();
+  // Moveable but not copyable
 
-  static std::mutex* mMutexs;
+  CurlEnvironment( const CurlEnvironment& ) = delete;
+  CurlEnvironment& operator=( const CurlEnvironment& ) = delete;
+  CurlEnvironment( CurlEnvironment&& ) = default;
+  CurlEnvironment& operator=( CurlEnvironment&& ) = default;
 };
 
 
@@ -101,4 +86,4 @@ bool DownloadRemoteFileIntoMemory( const std::string& url,
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_IMAGE_H__
+#endif // DALI_TIZEN_PLATFORM_RESOURCE_THREAD_IMAGE_H