diff --git a/pkg/copyright b/pkg/copyright index 2f9c4abc500..c105f7f2cce 100644 --- a/pkg/copyright +++ b/pkg/copyright @@ -106,10 +106,6 @@ Files: src/3rdparty/gsl_finally.h Copyright: 2015 Microsoft Corporation License: Expat -Files: src/3rdparty/integer_sequence.hpp -Copyright: 2017 by Simon Brand -License: CC0 - Files: src/3rdparty/physfs.hpp Copyright: 2013 Kevin Howell and others 2018 Arthur Brainville (Ybalrid) diff --git a/src/3rdparty/integer_sequence.hpp b/src/3rdparty/integer_sequence.hpp deleted file mode 100644 index 5c65eca9b68..00000000000 --- a/src/3rdparty/integer_sequence.hpp +++ /dev/null @@ -1,70 +0,0 @@ -/// -// TL library - A collection of small C++ utilities -// Written in 2017 by Simon Brand (@TartanLlama) -// -// To the extent possible under law, the author(s) have dedicated all -// copyright and related and neighboring rights to this software to the -// public domain worldwide. This software is distributed without any warranty. -// -// You should have received a copy of the CC0 Public Domain Dedication -// along with this software. If not, see . -/// -// An implementation of std::index_sequence in C++11 -// Also includes tl::make_index_range -/// - -#ifndef TL_INTEGER_SEQUENCE_HPP -#define TL_INTEGER_SEQUENCE_HPP - -#include - -namespace tl { - template - struct integer_sequence { - using type = integer_sequence; - using value_type = T; - static constexpr std::size_t size() { return sizeof...(Ns); } - }; - - namespace detail { - template - struct merge; - - template - struct merge , integer_sequence> - : integer_sequence - { }; - - // Adds Offset to every index in an integer sequence - template - integer_sequence offset_integer_sequence( - integer_sequence); - - template - struct make_integer_sequence - : detail::merge::type, - typename make_integer_sequence::type> - { }; - - template struct make_integer_sequence : integer_sequence {}; - template struct make_integer_sequence : integer_sequence {}; - } - - template - using make_integer_sequence = typename detail::make_integer_sequence::type; - - template - using index_sequence = integer_sequence; - - template - using make_index_sequence = make_integer_sequence; - - template - using index_sequence_for = make_index_sequence; - - template - using make_index_range = decltype( - detail::offset_integer_sequence(make_index_sequence{})); -} - -#endif diff --git a/src/quickjs_backend.cpp b/src/quickjs_backend.cpp index 372198210a1..ba4345d9d2f 100644 --- a/src/quickjs_backend.cpp +++ b/src/quickjs_backend.cpp @@ -95,7 +95,7 @@ MSVC_PRAGMA(warning( pop )) #pragma GCC diagnostic pop #endif #include "3rdparty/gsl_finally.h" -#include "3rdparty/integer_sequence.hpp" +#include // Alternatives for C++ - can't use the JS_CFUNC_DEF / JS_CGETSET_DEF / etc defines // #define JS_CFUNC_DEF(name, length, func1) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_CFUNC, 0, .u = { .func = { length, JS_CFUNC_generic, { .generic = func1 } } } } @@ -2136,7 +2136,7 @@ static JSValue callFunction(JSContext *ctx, const std::string &function, std::ve template struct UnboxTupleIndex; template - struct UnboxTupleIndex, T...> + struct UnboxTupleIndex, T...> { public: typedef std::tuple tuple_type; @@ -2174,7 +2174,7 @@ static JSValue callFunction(JSContext *ctx, const std::string &function, std::ve tuple_ref_type value; }; - template using UnboxTuple = UnboxTupleIndex, T...>; + template using UnboxTuple = UnboxTupleIndex, T...>; MSVC_PRAGMA(warning( push )) // see matching "pop" below MSVC_PRAGMA(warning( disable : 4189 )) // disable "warning C4189: 'idx': local variable is initialized but not referenced"