Revert "Removed cpp14 polyfills" to fix travis again.
This reverts commit def7acc366
.
This commit is contained in:
43
zeiterfassungcorelib/cpp14polyfills.h
Normal file
43
zeiterfassungcorelib/cpp14polyfills.h
Normal file
@@ -0,0 +1,43 @@
|
||||
#pragma once
|
||||
|
||||
#if __cplusplus < 201402L && _MSC_VER < 1800
|
||||
|
||||
// std includes
|
||||
#include <memory>
|
||||
#include <cstddef>
|
||||
#include <memory>
|
||||
#include <type_traits>
|
||||
#include <utility>
|
||||
|
||||
namespace std {
|
||||
template<class T> struct _Unique_if {
|
||||
typedef unique_ptr<T> _Single_object;
|
||||
};
|
||||
|
||||
template<class T> struct _Unique_if<T[]> {
|
||||
typedef unique_ptr<T[]> _Unknown_bound;
|
||||
};
|
||||
|
||||
template<class T, size_t N> struct _Unique_if<T[N]> {
|
||||
typedef void _Known_bound;
|
||||
};
|
||||
|
||||
template<class T, class... Args>
|
||||
typename _Unique_if<T>::_Single_object
|
||||
make_unique(Args&&... args) {
|
||||
return unique_ptr<T>(new T(std::forward<Args>(args)...));
|
||||
}
|
||||
|
||||
template<class T>
|
||||
typename _Unique_if<T>::_Unknown_bound
|
||||
make_unique(size_t n) {
|
||||
typedef typename remove_extent<T>::type U;
|
||||
return unique_ptr<T>(new U[n]());
|
||||
}
|
||||
|
||||
template<class T, class... Args>
|
||||
typename _Unique_if<T>::_Known_bound
|
||||
make_unique(Args&&...) = delete;
|
||||
}
|
||||
|
||||
#endif // __cplusplus < 201402L
|
@@ -26,6 +26,9 @@
|
||||
#include "replies/getabsencesreply.h"
|
||||
#include "replies/getdayinforeply.h"
|
||||
|
||||
//add support for pre cpp14 compilers
|
||||
#include "cpp14polyfills.h"
|
||||
|
||||
ZeiterfassungApi::ZeiterfassungApi(const QUrl &url, QObject *parent) :
|
||||
QObject(parent),
|
||||
m_url(url),
|
||||
|
@@ -29,7 +29,8 @@ SOURCES += timeutils.cpp \
|
||||
replies/updatetimeassignmentreply.cpp \
|
||||
replies/zeiterfassungreply.cpp
|
||||
|
||||
HEADERS += timeutils.h \
|
||||
HEADERS += cpp14polyfills.h \
|
||||
timeutils.h \
|
||||
zeiterfassungapi.h \
|
||||
zeiterfassungcorelib_global.h \
|
||||
zeiterfassungsettings.h \
|
||||
|
Reference in New Issue
Block a user