Compare commits
No commits in common. "f3c7ff25cfcc7c01a5961652a944e9857bdacafb" and "11866bf3ba64c468ab38a263a36f118b477399f0" have entirely different histories.
f3c7ff25cf
...
11866bf3ba
@ -47,5 +47,5 @@ if(MYXLIB_BUILD_EXAMPLES)
|
||||
add_dependencies(${TRGT} create_auxilary_symlinks)
|
||||
|
||||
# Правила для установки
|
||||
# install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
@ -48,5 +48,5 @@ if(MYXLIB_BUILD_EXAMPLES)
|
||||
add_dependencies(${TRGT} create_auxilary_symlinks)
|
||||
|
||||
# Правила для установки
|
||||
# install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
@ -55,5 +55,5 @@ if(MYXLIB_BUILD_EXAMPLES)
|
||||
add_dependencies(${TRGT} create_auxilary_symlinks)
|
||||
|
||||
# Правила для установки
|
||||
# install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
@ -49,5 +49,5 @@ if(MYXLIB_BUILD_EXAMPLES)
|
||||
add_dependencies(${TRGT} create_auxilary_symlinks)
|
||||
|
||||
# Правила для установки
|
||||
# install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
@ -4,7 +4,6 @@
|
||||
#pragma once
|
||||
|
||||
#if ( __cplusplus >= 201103L )
|
||||
#include <memory>
|
||||
#include <type_traits>
|
||||
#endif
|
||||
|
||||
@ -16,25 +15,19 @@ namespace std
|
||||
template< class T >
|
||||
using underlying_type_t = typename std::underlying_type< T >::type;
|
||||
|
||||
template< typename T, typename ... Args >
|
||||
std::unique_ptr< T > make_unique( Args&&... args )
|
||||
{
|
||||
return( std::unique_ptr< T >( new T( std::forward< Args >( args )... ) ) );
|
||||
}
|
||||
|
||||
} // namespace std
|
||||
|
||||
#endif
|
||||
|
||||
#if ( ( __cplusplus >= 201103L ) && ( __cplusplus < 201402L ) ) || \
|
||||
( ( __cplusplus >= 201402L ) && ( __cplusplus < 201702L ) && defined( __STRICT_ANSI__ ) )
|
||||
|
||||
#if ( __cplusplus >= 201103L ) && ( __cplusplus < 201702L )
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
||||
#if defined( __STRICT_ANSI__ ) || ( __e2k__ )
|
||||
template< typename ... Ts > struct make_void { typedef void type; };
|
||||
template< typename ... Ts > using void_t = typename make_void< Ts... >::type;
|
||||
#endif
|
||||
|
||||
} // namespace std
|
||||
|
||||
|
@ -3,11 +3,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#if !defined( QT_VERSION )
|
||||
#include <QtGlobal>
|
||||
#endif
|
||||
#if defined( QT_VERSION )
|
||||
|
||||
#if ( QT_VERSION <= 0x050700 )
|
||||
#if QT_VERSION <= 0x050700
|
||||
#include <QtGlobal>
|
||||
template< typename ... Args >
|
||||
struct QOverload
|
||||
{
|
||||
@ -30,6 +29,9 @@ Q_DECL_CONSTEXPR typename std::add_const< T >::type& qAsConst( T& t ) noexcept
|
||||
template < typename T >
|
||||
void qAsConst( const T&& ) = delete;
|
||||
|
||||
|
||||
#endif // if QT_VERSION <= 0x050700
|
||||
|
||||
#endif // if defined( QT_VERSION )
|
||||
|
||||
#endif // MYX_BACKPORTS_QT_COMMON_HPP_
|
||||
|
@ -63,7 +63,7 @@ MYXLIB_INLINE void PosixSignalWatcherPrivate::watchForSignal( int signal )
|
||||
|
||||
#if MYX_QT_HAS_POSIX_SIGNALS
|
||||
// Register a sigaction which will write to the socket pair
|
||||
struct sigaction sigact;
|
||||
struct sigaction sigact {};
|
||||
sigact.sa_handler = PosixSignalWatcherPrivate::signalHandler; //NOLINT
|
||||
sigact.sa_flags = 0;
|
||||
sigemptyset( &sigact.sa_mask );
|
||||
|
Loading…
Reference in New Issue
Block a user