Browse Source

MSVC 2013 compatibility: nullptr-related issues.

I wonder why this wasn't an issue on GCCC < 4.6.
Vladimír Vondruš 12 years ago
parent
commit
49f7cd5bcd
  1. 2
      src/Magnum/MeshTools/Interleave.h

2
src/Magnum/MeshTools/Interleave.h

@ -151,7 +151,7 @@ template<class T, class ...U> typename std::enable_if<!std::is_same<T, Mesh>::va
/* Otherwise return nullptr */
} else {
#ifndef CORRADE_GCC44_COMPATIBILITY
#if !defined(CORRADE_GCC44_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY)
return std::make_tuple(0, stride, nullptr);
#else
return std::tuple<std::size_t, std::size_t, Containers::Array<char>>(0, stride, Containers::Array<char>());

Loading…
Cancel
Save