GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r52:4b12b115f92f

Merge branch 'feature/CpackForWindows' into develop

perrinel -

r52:4b12b115f92f

parent child

Context file:

r52:4b12b115f92f

SciQlopEnv.bat +2 -1

             @echo off
             echo Setting up environment for Qt usage...
             set QT_QMAKE_PATH=C:\Qt\5.8\mingw53_32\bin
             set QT_MINGW_PATH=C:\Qt\Tools\mingw530_32\bin
+            set NSIS_PATH=C:\Appli\NSIS
             set LLVM_PATH=C:\Appli\LLVM\bin
             set CMAKE_PATH=C:\Appli\CMake\bin
             set NINJA_PATH=C:\Appli\Ninja
             set PERL_SITE_PATH=C:\Perl64\site\bin
             set PERL_PATH=C:\Perl64\bin
             set PYTHON_PATH=C:\Appli\Python\Python36-32
             set SCAN_BUILD_PATH=C:\Dev\CNRS-DEV\cfe\tools\scan-build\bin
-            set PATH=%QT_QMAKE_PATH%;%QT_MINGW_PATH%;%PERL_SITE_PATH%;%PERL_PATH%;%PYTHON_PATH%;%SCAN_BUILD_PATH%;%LLVM_PATH%;%CMAKE_PATH%;%NINJA_PATH%;%PATH%
+            set PATH=%QT_QMAKE_PATH%;%QT_MINGW_PATH%;%PERL_SITE_PATH%;%PERL_PATH%;%PYTHON_PATH%;%NSIS_PATH%;%SCAN_BUILD_PATH%;%LLVM_PATH%;%CMAKE_PATH%;%NINJA_PATH%;%PATH%
             cd /D C:\Dev\CNRS-DEV\SciQlopInit

app/CMakeLists.txt +1 0

             ## sciqlop - CMakeLists.txt
             SET(EXECUTABLE_NAME "sciqlop")
+            SCIQLOP_SET_TO_PARENT_SCOPE(EXECUTABLE_NAME)
             SET(SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/)
             SET(INCLUDE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/include)
             SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/src)
             SET(RES_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/resources)
             #
             # Find Qt modules
             #
             SCIQLOP_FIND_QT(Core Widgets)
             #
             # Find dependent libraries
             # ========================
             find_package(sciqlop-gui)
             SET(LIBRARIES ${SCIQLOP-GUI_LIBRARIES})
             SET(EXTERN_SHARED_LIBRARIES)
             INCLUDE_DIRECTORIES(${SCIQLOP-GUI_INCLUDE_DIR})
             # Add sqpcore to the list of libraries to use
             list(APPEND LIBRARIES ${SQPCORE_LIBRARY_NAME})
             # Include core directory
             include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../core/include")
             # Add dependent shared libraries
             list(APPEND SHARED_LIBRARIES ${SQPCORE_SHARED_LIBRARIES})
             # Retrieve the location of the dynamic library to copy it to the output path
             #get_property(sqpcoreLocation TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY LOCATION)
             list(APPEND SHARED_LIBRARIES_FROM_TARGETS ${sqpcoreLocation})
             #
             # Compile the application
             #
             FILE (GLOB_RECURSE APPLICATION_SOURCES
             	${SOURCES_DIR}/*.c
             	${SOURCES_DIR}/*.cpp
             	${SOURCES_DIR}/*.h)
             # Headers files (.h)
             FILE (GLOB_RECURSE PROJECT_HEADERS ${INCLUDE_FOLDER}/*.h)
             # Ui files
             FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
             # Resources files
             FILE (GLOB_RECURSE PROJECT_RESOURCES ${RES_FOLDER}/*.qrc)
             # Retrieve resources files
             FILE (GLOB_RECURSE APPLICATION_RESOURCES ${RES_FOLDER}/*.qrc)
             QT5_ADD_RESOURCES(RCC_HDRS ${APPLICATION_RESOURCES} )
             QT5_WRAP_UI(UIS_HDRS
              ${PROJECT_FORMS}
             )
             ADD_EXECUTABLE(${EXECUTABLE_NAME} ${APPLICATION_SOURCES} ${RCC_HDRS} ${UIS_HDRS})
             set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 14)
             set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
             target_link_libraries(${EXECUTABLE_NAME}
                 ${LIBRARIES})
             # Link with Qt5 modules
             qt5_use_modules(${EXECUTABLE_NAME} Core Widgets)
             # Add the files to the list of files to be analyzed
             LIST(APPEND CHECKSTYLE_INPUT_FILES ${APPLICATION_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)
             # Vera++ exclusion files
             LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt)
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             #
             # Compile the tests
             #
             IF(BUILD_TESTS)
             	INCLUDE_DIRECTORIES(${SOURCES_DIR})
             	FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)
             	FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)
                     SET( TEST_LIBRARIES ${LIBRARIES})
             	FOREACH( testFile ${TESTS_SOURCES} )
             		GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
                             GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
             		# Add to the list of sources files all the sources in the same
             		# directory that aren't another test
             		FILE (GLOB currentTestSources
             			${testDirectory}/*.c
             			${testDirectory}/*.cpp
             			${testDirectory}/*.h)
             		LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})
             		LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
             		ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
                             TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES})
             		qt5_use_modules(${testName} Test)
             		ADD_TEST( NAME ${testName} COMMAND ${testName} )
                             SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName})
             	ENDFOREACH( testFile )
             	LIST(APPEND testFilesToFormat ${TESTS_SOURCES})
             	LIST(APPEND testFilesToFormat ${TESTS_HEADERS})
             	LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat})
                     SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             ENDIF(BUILD_TESTS)
             #
             # Set the files that must be formatted by clang-format.
             #
             LIST (APPEND FORMATTING_INPUT_FILES ${APPLICATION_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             #
             # Set the directories that doxygen must browse to generate the
             # documentation.
             #
             # Source directories:
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/docs")
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_INPUT_DIRS)
             # Source directories to exclude from the documentation generation
             #LIST (APPEND DOXYGEN_EXCLUDE_PATTERNS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir/*")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_EXCLUDE_PATTERNS)
             #
             # Set the directories with the sources to analyze and propagate the
             # modification to the parent scope
             #
             # Source directories to analyze:
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_INPUT_DIRS)
             # Source directories to exclude from the analysis
             #LIST (APPEND ANALYSIS_EXCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_EXCLUDE_DIRS)

cmake/sciqlop_applications.cmake +5 -6

             #
             # Sciqlop_modules.cmake
             #
             # Set ouptut directories
             #
-            SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
+            SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
-            SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
+            SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
             IF (UNIX)
                 SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
             ELSEIF(WIN32)
-                SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}/app/QtProject)
+                SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/app/QtProject)
             ELSE()
-                SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
+                SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
             ENDIF()
-            INCLUDE ("cmake/sciqlop_code_coverage.cmake")
             if(BUILD_TESTS)
+                INCLUDE ("cmake/sciqlop_code_coverage.cmake")
                 APPEND_COVERAGE_COMPILER_FLAGS()
             endif(BUILD_TESTS)
             #
             # Compile the diffents modules
             #
             set(sciqlop-core_DIR "${CMAKE_SOURCE_DIR}/core/cmake")
             set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-core_DIR}")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/core")
             set(sciqlop-gui_DIR "${CMAKE_SOURCE_DIR}/gui/cmake")
             set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-gui_DIR}")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/gui")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")
             # LOGGER
             set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini")
             FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH})
             #
             # Code formatting
             #
             # Vera++ exclusion files
             LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/formatting/vera-exclusions/exclusions.txt)
             #SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             INCLUDE ("cmake/sciqlop_formatting.cmake")
             #
             # Documentation generation
             #
             INCLUDE ("cmake/sciqlop_doxygen.cmake")
             #
             # Source code analysis
             #
             INCLUDE ("cmake/sciqlop_code_analysis.cmake")
             INCLUDE ("cmake/sciqlop_code_cppcheck.cmake")

cmake/sciqlop_package.cmake +60 0

@@ -0,0 +1,60
	1	#
	2	# Generate the source package of SciqLop.
	3	#
	4
	5	install(DIRECTORY
	6	${EXECUTABLE_OUTPUT_PATH}
	7	DESTINATION "."
	8	USE_SOURCE_PERMISSIONS
	9	COMPONENT CORE
	10	PATTERN "*.a" EXCLUDE
	11	)
	12
	13	set(EXECUTABLEDOTEXTENSION)
	14	if(WIN32)
	15	set(EXECUTABLEDOTEXTENSION ".exe")
	16	endif(WIN32)
	17	set (SCIQLOP_EXE_LOCATION ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE_NAME}${EXECUTABLEDOTEXTENSION})
	18
	19	if(WIN32)
	20	include ("cmake/sciqlop_package_qt.cmake")
	21	endif(WIN32)
	22
	23
	24	SET (CPACK_PACKAGE_VENDOR "CNRS")
	25	SET (CPACK_PACKAGE_VERSION_MAJOR "${SCIQLOP_VERSION_MAJOR}")
	26	SET (CPACK_PACKAGE_VERSION_MINOR "${SCIQLOP_VERSION_MINOR}")
	27	SET (CPACK_PACKAGE_VERSION_PATCH "${SCIQLOP_VERSION_PATCH}${SCIQLOP_VERSION_SUFFIX}")
	28	SET (CPACK_PACKAGE_VERSION "${SCIQLOP_VERSION}")
	29	SET (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
	30	SET (CPACK_PACKAGE_CONTACT "nicolas.aunai@lpp.polytechnique.fr")
	31	SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
	32	# SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/WARN.txt)
	33	SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE)
	34	# SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_NAME}-${PROJECT_VERSION})
	35	SET(FULLBUILD ON)
	36
	37	SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
	38	SET(CPACK_GENERATOR "NSIS")
	39	SET(CPACK_MONOLITHIC_INSTALL 1)
	40	#SET(CPACK_COMPONENTS_ALL sciqlop qt)
	41	SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Setup")
	42	SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_NAME})
	43
	44	set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
	45	message("exepath" ${CPACK_PACKAGE_INSTALL_DIRECTORY})
	46
	47	if (WIN32)
	48	SET(CPACK_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
	49	SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
	50	SET(CPACK_NSIS_COMPONENT_INSTALL ON)
	51	SET(CPACK_SYSTEM_NAME "MinGW32")
	52	SET(CPACK_PACKAGING_INSTALL_PREFIX "")
	53	#SET(CPACK_GENERATOR "NSIS")
	54	SET(CPACK_NSIS_DISPLAY_NAME ${PROJECT_NAME})
	55	SET(CPACK_NSIS_MUI_FINISHPAGE_RUN ${SCIQLOP_EXECUTABLE_NAME})
	56	SET(CPACK_NSIS_MUI_ICON ${SCIQLOP_EXECUTABLE_ICON_LOCATION})
	57	SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${SCIQLOP_EXECUTABLE_NAME}.exe")
	58	endif (WIN32)
	59
	60	INCLUDE(CPack)

core/include/Common/spimpl.h +9 -13

             /*
                 ====================================================================
                 A Smart Pointer to IMPLementation (i.e. Smart PIMPL or just SPIMPL).
                 ====================================================================
                 Version: 1.1
                 Latest version:
                     https://github.com/oliora/samples/blob/master/spimpl.h
                 Rationale and description:
                     http://oliora.github.io/2015/12/29/pimpl-and-rule-of-zero.html
                 Copyright (c) 2015 Andrey Upadyshev (oliora@gmail.com)
                 Distributed under the Boost Software License, Version 1.0.
                 See http://www.boost.org/LICENSE_1_0.txt
                 Changes history
                 ---------------
                 v1.1:
                     - auto_ptr support is disabled by default for C++17 compatibility
                 v1.0:
                     - Released
              */
             #ifndef SPIMPL_H_
             #define SPIMPL_H_
             #include <cassert>
             #include <memory>
             #include <type_traits>
             #if defined _MSC_VER && _MSC_VER < 1900 // MS Visual Studio before VS2015
             #define SPIMPL_NO_CPP11_NOEXCEPT
             #define SPIMPL_NO_CPP11_CONSTEXPR
             #define SPIMPL_NO_CPP11_DEFAULT_MOVE_SPEC_FUNC
             #endif
             #if !defined SPIMPL_NO_CPP11_NOEXCEPT
             #define SPIMPL_NOEXCEPT noexcept
             #else
             #define SPIMPL_NOEXCEPT
             #endif
             #if !defined SPIMPL_NO_CPP11_CONSTEXPR
             #define SPIMPL_CONSTEXPR constexpr
             #else
             #define SPIMPL_CONSTEXPR
             #endif
             // define SPIMPL_HAS_AUTO_PTR to enable constructor and assignment operator that accept
             // std::auto_ptr
             // TODO: auto detect std::auto_ptr support
             namespace spimpl {
             namespace details {
             template <class T>
             T *default_copy(T *src)
             {
                 static_assert(sizeof(T) > 0, "default_copy cannot copy incomplete type");
                 static_assert(!std::is_void<T>::value, "default_copy cannot copy incomplete type");
                 return new T(*src);
             }
             template <class T>
             void default_delete(T *p) SPIMPL_NOEXCEPT
             {
                 static_assert(sizeof(T) > 0, "default_delete cannot delete incomplete type");
                 static_assert(!std::is_void<T>::value, "default_delete cannot delete incomplete type");
                 delete p;
             }
             template <class T>
             struct default_deleter {
                 using type = void (*)(T *);
             };
             template <class T>
             using default_deleter_t = typename default_deleter<T>::type;
             template <class T>
             struct default_copier {
                 using type = T *(*)(T *);
             };
             template <class T>
             using default_copier_t = typename default_copier<T>::type;
             template <class T, class D, class C>
             struct is_default_manageable
-                : public std::integral_constant<bool,
+                : public std::integral_constant<bool, std::is_same<D, default_deleter_t<T> >::value
-                                                std::is_same<D, default_deleter_t<T> >::value
                                                           && std::is_same<C, default_copier_t<T> >::value> {
             };
             }
             template <class T, class Deleter = details::default_deleter_t<T>,
                       class Copier = details::default_copier_t<T> >
             class impl_ptr {
             private:
                 static_assert(!std::is_array<T>::value,
                               "impl_ptr specialization for arrays is not implemented");
                 struct dummy_t_ {
                     int dummy__;
                 };
             public:
                 using pointer = T *;
                 using element_type = T;
                 using copier_type = typename std::decay<Copier>::type;
                 using deleter_type = typename std::decay<Deleter>::type;
                 using unique_ptr_type = std::unique_ptr<T, deleter_type>;
                 using is_default_manageable = details::is_default_manageable<T, deleter_type, copier_type>;
                 SPIMPL_CONSTEXPR impl_ptr() SPIMPL_NOEXCEPT : ptr_(nullptr, deleter_type{}),
                                                               copier_(copier_type{})
                 {
                 }
                 SPIMPL_CONSTEXPR impl_ptr(std::nullptr_t) SPIMPL_NOEXCEPT : impl_ptr() {}
                 template <class D, class C>
                 impl_ptr(pointer p, D &&d, C &&c,
                          typename std::enable_if<std::is_convertible<D, deleter_type>::value
                                                      && std::is_convertible<C, copier_type>::value,
                                                  dummy_t_>::type
                          = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(std::move(p), std::forward<D>(d)),
                                                          copier_(std::forward<C>(c))
                 {
                 }
                 template <class U>
-                impl_ptr(U *u,
+                impl_ptr(U *u, typename std::enable_if<std::is_convertible<U *, pointer>::value
-                         typename std::enable_if<std::is_convertible<U *, pointer>::value
                                                            && is_default_manageable::value,
                                                        dummy_t_>::type
                                = dummy_t_()) SPIMPL_NOEXCEPT
                     : impl_ptr(u, &details::default_delete<T>, &details::default_copy<T>)
                 {
                 }
                 impl_ptr(const impl_ptr &r) : impl_ptr(r.clone()) {}
             #ifndef SPIMPL_NO_CPP11_DEFAULT_MOVE_SPEC_FUNC
                 impl_ptr(impl_ptr &&r) SPIMPL_NOEXCEPT = default;
             #else
                 impl_ptr(impl_ptr &&r) SPIMPL_NOEXCEPT : ptr_(std::move(r.ptr_)), copier_(std::move(r.copier_))
                 {
                 }
             #endif
             #ifdef SPIMPL_HAS_AUTO_PTR
                 template <class U>
-                impl_ptr(std::auto_ptr<U> &&u,
+                impl_ptr(std::auto_ptr<U> &&u, typename std::enable_if<std::is_convertible<U *, pointer>::value
-                         typename std::enable_if<std::is_convertible<U *, pointer>::value
                                                                            && is_default_manageable::value,
                                                                        dummy_t_>::type
-                         = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(u.release(), &details::default_delete<T>),
+                                               = dummy_t_()) SPIMPL_NOEXCEPT
+                    : ptr_(u.release(), &details::default_delete<T>),
                       copier_(&details::default_copy<T>)
                 {
                 }
             #endif
                 template <class U>
                 impl_ptr(std::unique_ptr<U> &&u,
                          typename std::enable_if<std::is_convertible<U *, pointer>::value
                                                      && is_default_manageable::value,
                                                  dummy_t_>::type
                          = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(u.release(), &details::default_delete<T>),
                                                          copier_(&details::default_copy<T>)
                 {
                 }
                 template <class U, class D, class C>
                 impl_ptr(std::unique_ptr<U, D> &&u, C &&c,
                          typename std::enable_if<std::is_convertible<U *, pointer>::value
                                                      && std::is_convertible<D, deleter_type>::value
                                                      && std::is_convertible<C, copier_type>::value,
                                                  dummy_t_>::type
                          = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(std::move(u)),
                                                          copier_(std::forward<C>(c))
                 {
                 }
                 template <class U, class D, class C>
                 impl_ptr(impl_ptr<U, D, C> &&u,
                          typename std::enable_if<std::is_convertible<U *, pointer>::value
                                                      && std::is_convertible<D, deleter_type>::value
                                                      && std::is_convertible<C, copier_type>::value,
                                                  dummy_t_>::type
                          = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(std::move(u.ptr_)),
                                                          copier_(std::move(u.copier_))
                 {
                 }
                 impl_ptr &operator=(const impl_ptr &r)
                 {
                     if (this == &r)
                         return *this;
                     return operator=(r.clone());
                 }
             #ifndef SPIMPL_NO_CPP11_DEFAULT_MOVE_SPEC_FUNC
                 impl_ptr &operator=(impl_ptr &&r) SPIMPL_NOEXCEPT = default;
             #else
                 impl_ptr &operator=(impl_ptr &&r) SPIMPL_NOEXCEPT
                 {
                     ptr_ = std::move(r.ptr_);
                     copier_ = std::move(r.copier_);
                     return *this;
                 }
             #endif
                 template <class U, class D, class C>
                 typename std::enable_if<std::is_convertible<U *, pointer>::value
                                             && std::is_convertible<D, deleter_type>::value
                                             && std::is_convertible<C, copier_type>::value,
                                         impl_ptr &>::type
                 operator=(impl_ptr<U, D, C> &&u) SPIMPL_NOEXCEPT
                 {
                     ptr_ = std::move(u.ptr_);
                     copier_ = std::move(u.copier_);
                     return *this;
                 }
                 template <class U, class D, class C>
                 typename std::enable_if<std::is_convertible<U *, pointer>::value
                                             && std::is_convertible<D, deleter_type>::value
                                             && std::is_convertible<C, copier_type>::value,
                                         impl_ptr &>::type
                 operator=(const impl_ptr<U, D, C> &u)
                 {
                     return operator=(u.clone());
                 }
             //
             #ifdef SPIMPL_HAS_AUTO_PTR
                 template <class U>
-                typename std::enable_if<std::is_convertible<U *, pointer>::value
+                typename std::enable_if<
-                                            && is_default_manageable::value,
+                    std::is_convertible<U *, pointer>::value && is_default_manageable::value, impl_ptr &>::type
-                                        impl_ptr &>::type
                 operator=(std::auto_ptr<U> &&u) SPIMPL_NOEXCEPT
                 {
                     return operator=(impl_ptr(std::move(u)));
                 }
             #endif
                 template <class U>
-                typename std::enable_if<std::is_convertible<U *, pointer>::value
+                typename std::enable_if<
-                                            && is_default_manageable::value,
+                    std::is_convertible<U *, pointer>::value && is_default_manageable::value, impl_ptr &>::type
-                                        impl_ptr &>::type
                 operator=(std::unique_ptr<U> &&u) SPIMPL_NOEXCEPT
                 {
                     return operator=(impl_ptr(std::move(u)));
                 }
                 impl_ptr clone() const
                 {
                     return impl_ptr(ptr_ ? copier_(ptr_.get()) : nullptr, ptr_.get_deleter(), copier_);
                 }
                 typename std::remove_reference<T>::type &operator*() const { return *ptr_; }
                 pointer operator->() const SPIMPL_NOEXCEPT { return get(); }
                 pointer get() const SPIMPL_NOEXCEPT { return ptr_.get(); }
                 void swap(impl_ptr &u) SPIMPL_NOEXCEPT
                 {
                     using std::swap;
                     ptr_.swap(u.ptr_);
                     swap(copier_, u.copier_);
                 }
                 pointer release() SPIMPL_NOEXCEPT { return ptr_.release(); }
                 unique_ptr_type release_unique() SPIMPL_NOEXCEPT { return std::move(ptr_); }
                 explicit operator bool() const SPIMPL_NOEXCEPT { return static_cast<bool>(ptr_); }
                 typename std::remove_reference<deleter_type>::type &get_deleter() SPIMPL_NOEXCEPT
                 {
                     return ptr_.get_deleter();
                 }
                 const typename std::remove_reference<deleter_type>::type &get_deleter() const SPIMPL_NOEXCEPT
                 {
                     return ptr_.get_deleter();
                 }
                 typename std::remove_reference<copier_type>::type &get_copier() SPIMPL_NOEXCEPT
                 {
                     return copier_;
                 }
                 const typename std::remove_reference<copier_type>::type &get_copier() const SPIMPL_NOEXCEPT
                 {
                     return copier_;
                 }
             private:
                 unique_ptr_type ptr_;
                 copier_type copier_;
             };
             template <class T, class D, class C>
             inline void swap(impl_ptr<T, D, C> &l, impl_ptr<T, D, C> &r) SPIMPL_NOEXCEPT
             {
                 l.swap(r);
             }
             template <class T1, class D1, class C1, class T2, class D2, class C2>
             inline bool operator==(const impl_ptr<T1, D1, C1> &l, const impl_ptr<T2, D2, C2> &r)
             {
                 return l.get() == r.get();
             }
             template <class T1, class D1, class C1, class T2, class D2, class C2>
             inline bool operator!=(const impl_ptr<T1, D1, C1> &l, const impl_ptr<T2, D2, C2> &r)
             {
                 return !(l == r);
             }
             template <class T1, class D1, class C1, class T2, class D2, class C2>
             inline bool operator<(const impl_ptr<T1, D1, C1> &l, const impl_ptr<T2, D2, C2> &r)
             {
                 using P1 = typename impl_ptr<T1, D1, C1>::pointer;
                 using P2 = typename impl_ptr<T2, D2, C2>::pointer;
                 using CT = typename std::common_type<P1, P2>::type;
                 return std::less<CT>()(l.get(), r.get());
             }
             template <class T1, class D1, class C1, class T2, class D2, class C2>
             inline bool operator>(const impl_ptr<T1, D1, C1> &l, const impl_ptr<T2, D2, C2> &r)
             {
                 return r < l;
             }
             template <class T1, class D1, class C1, class T2, class D2, class C2>
             inline bool operator<=(const impl_ptr<T1, D1, C1> &l, const impl_ptr<T2, D2, C2> &r)
             {
                 return !(r < l);
             }
             template <class T1, class D1, class C1, class T2, class D2, class C2>
             inline bool operator>=(const impl_ptr<T1, D1, C1> &l, const impl_ptr<T2, D2, C2> &r)
             {
                 return !(l < r);
             }
             template <class T, class D, class C>
             inline bool operator==(const impl_ptr<T, D, C> &p, std::nullptr_t) SPIMPL_NOEXCEPT
             {
                 return !p;
             }
             template <class T, class D, class C>
             inline bool operator==(std::nullptr_t, const impl_ptr<T, D, C> &p) SPIMPL_NOEXCEPT
             {
                 return !p;
             }
             template <class T, class D, class C>
             inline bool operator!=(const impl_ptr<T, D, C> &p, std::nullptr_t) SPIMPL_NOEXCEPT
             {
                 return static_cast<bool>(p);
             }
             template <class T, class D, class C>
             inline bool operator!=(std::nullptr_t, const impl_ptr<T, D, C> &p) SPIMPL_NOEXCEPT
             {
                 return static_cast<bool>(p);
             }
             template <class T, class D, class C>
             inline bool operator<(const impl_ptr<T, D, C> &l, std::nullptr_t)
             {
                 using P = typename impl_ptr<T, D, C>::pointer;
                 return std::less<P>()(l.get(), nullptr);
             }
             template <class T, class D, class C>
             inline bool operator<(std::nullptr_t, const impl_ptr<T, D, C> &p)
             {
                 using P = typename impl_ptr<T, D, C>::pointer;
                 return std::less<P>()(nullptr, p.get());
             }
             template <class T, class D, class C>
             inline bool operator>(const impl_ptr<T, D, C> &p, std::nullptr_t)
             {
                 return nullptr < p;
             }
             template <class T, class D, class C>
             inline bool operator>(std::nullptr_t, const impl_ptr<T, D, C> &p)
             {
                 return p < nullptr;
             }
             template <class T, class D, class C>
             inline bool operator<=(const impl_ptr<T, D, C> &p, std::nullptr_t)
             {
                 return !(nullptr < p);
             }
             template <class T, class D, class C>
             inline bool operator<=(std::nullptr_t, const impl_ptr<T, D, C> &p)
             {
                 return !(p < nullptr);
             }
             template <class T, class D, class C>
             inline bool operator>=(const impl_ptr<T, D, C> &p, std::nullptr_t)
             {
                 return !(p < nullptr);
             }
             template <class T, class D, class C>
             inline bool operator>=(std::nullptr_t, const impl_ptr<T, D, C> &p)
             {
                 return !(nullptr < p);
             }
             template <class T, class... Args>
             inline impl_ptr<T> make_impl(Args &&... args)
             {
                 return impl_ptr<T>(new T(std::forward<Args>(args)...), &details::default_delete<T>,
                                    &details::default_copy<T>);
             }
             // Helpers to manage unique impl, stored in std::unique_ptr
             template <class T, class Deleter = void (*)(T *)>
             using unique_impl_ptr = std::unique_ptr<T, Deleter>;
             template <class T, class... Args>
             inline unique_impl_ptr<T> make_unique_impl(Args &&... args)
             {
                 static_assert(!std::is_array<T>::value, "unique_impl_ptr does not support arrays");
                 return unique_impl_ptr<T>(new T(std::forward<Args>(args)...), &details::default_delete<T>);
             }
             }
             namespace std {
             template <class T, class D, class C>
             struct hash<spimpl::impl_ptr<T, D, C> > {
                 using argument_type = spimpl::impl_ptr<T, D, C>;
                 using result_type = size_t;
                 result_type operator()(const argument_type &p) const SPIMPL_NOEXCEPT
                 {
                     return hash<typename argument_type::pointer>()(p.get());
                 }
             };
             }
             #endif // SPIMPL_H_

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages