diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-10-14 15:43:06 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 18:52:10 -0400 |
| commit | ce2b56b2f899542b5d7df3e118cbae1fdd7df722 (patch) | |
| tree | 3f088001acdfae42ff4d95f80e9474d2e298c247 /indra/llcommon | |
| parent | 6b70493ddb1b95a2d3527e2189f5b94f5a2b606f (diff) | |
DRTVWR-476: Engage variadic llmake() implementation.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llmake.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/indra/llcommon/llmake.h b/indra/llcommon/llmake.h index f901ee2bf1..02463d97ea 100644 --- a/indra/llcommon/llmake.h +++ b/indra/llcommon/llmake.h @@ -23,9 +23,6 @@ #if ! defined(LL_LLMAKE_H) #define LL_LLMAKE_H -// If we're using a compiler newer than VS 2013, use variadic llmake(). -#if (! defined(_MSC_VER)) || (_MSC_VER > 1800) - /** * Usage: llmake<SomeTemplate>(args...) * @@ -38,22 +35,6 @@ CLASS_TEMPLATE<ARGS...> llmake(ARGS && ... args) return CLASS_TEMPLATE<ARGS...>(std::forward<ARGS>(args)...); } -#else // older implementation for VS 2013 - -template <template<typename> class CLASS_TEMPLATE, typename ARG1> -CLASS_TEMPLATE<ARG1> llmake(const ARG1& arg1) -{ - return CLASS_TEMPLATE<ARG1>(arg1); -} - -template <template<typename, typename> class CLASS_TEMPLATE, typename ARG1, typename ARG2> -CLASS_TEMPLATE<ARG1, ARG2> llmake(const ARG1& arg1, const ARG2& arg2) -{ - return CLASS_TEMPLATE<ARG1, ARG2>(arg1, arg2); -} - -#endif // VS 2013 workaround - /// dumb pointer template just in case that's what's wanted template <typename T> using dumb_pointer = T*; |