Merge branch 'master' into compatibility

external/Optional/optional.hpp

@@ -21,7 +21,11 @@
 # define REQUIRES(...) typename enable_if<__VA_ARGS__::value, bool>::type = false
 
 # if defined __clang__
-#  define OPTIONAL_HAS_USING 1
+#  if (__clang_major__ >= 3)
+#   define OPTIONAL_HAS_USING 1
+#  else
+#   define OPTIONAL_HAS_USING 0
+#  endif
 #  if (__clang_major__ > 2) || (__clang_major__ == 2) && (__clang_minor__ >= 9)
 #   define OPTIONAL_HAS_THIS_RVALUE_REFS 1
 #  else

package/archlinux/PKGBUILD

@@ -4,7 +4,7 @@ pkgver=dev
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal' 'freeglut' 'sdl2')
 makedepends=('cmake' 'ninja')

package/archlinux/PKGBUILD-clang

@@ -4,7 +4,7 @@ pkgver=dev.clang
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (built with clang)"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal' 'freeglut' 'sdl2')
 makedepends=('cmake' 'clang' 'ninja')

package/archlinux/PKGBUILD-clang-libc++

@@ -4,7 +4,7 @@ pkgver=dev.clang.libc++
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (built with clang and libc++)"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal' 'freeglut' 'sdl2' 'libc++')
 makedepends=('cmake' 'clang' 'ninja')

package/archlinux/PKGBUILD-es2

@@ -4,7 +4,7 @@ pkgver=dev.es2
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (OpenGL ES 2.0 version)"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal')
 makedepends=('cmake' 'ninja')

package/archlinux/PKGBUILD-es2desktop

@@ -4,7 +4,7 @@ pkgver=dev.es2desktop
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (desktop OpenGL ES 2.0 version)"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal')
 makedepends=('cmake' 'ninja')

package/archlinux/PKGBUILD-es3

@@ -4,7 +4,7 @@ pkgver=dev.es3
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (OpenGL ES 3.0 version)"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal')
 makedepends=('cmake' 'ninja')

package/archlinux/PKGBUILD-gcc46

@@ -4,7 +4,7 @@ pkgver=dev.gcc46
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (built with GCC 4.6)"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal' 'freeglut' 'sdl2')
 makedepends=('cmake' 'ninja' 'gcc46')

package/archlinux/PKGBUILD-gcc47

@@ -4,7 +4,7 @@ pkgver=dev.gcc47
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (built with GCC 4.7)"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal' 'freeglut' 'sdl2')
 makedepends=('cmake' 'ninja' 'gcc47')

package/archlinux/PKGBUILD-gcc49

@@ -4,7 +4,7 @@ pkgver=dev.gcc49
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (built with GCC 4.9)"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal' 'freeglut' 'sdl2')
 makedepends=('cmake' 'ninja' 'gcc-git')

package/archlinux/PKGBUILD-mingw32

@@ -4,7 +4,7 @@ pkgver=dev
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (mingw32)"
 arch=('any')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('mingw32-runtime' 'mingw32-corrade' 'mingw32-freeglut' 'mingw32-openal')
 makedepends=('mingw32-gcc' 'cmake' 'ninja' 'corrade')

package/archlinux/PKGBUILD-nacl-glibc

@@ -4,7 +4,7 @@ pkgver=dev.glibc
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (NaCl glibc version)"
 arch=('any')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('nacl-corrade')
 makedepends=('nacl-sdk' 'cmake' 'corrade' 'ninja')

package/archlinux/PKGBUILD-nacl-newlib

@@ -4,7 +4,7 @@ pkgver=dev.newlib
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (NaCl newlib version)"
 arch=('any')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('nacl-corrade')
 makedepends=('nacl-sdk' 'cmake' 'corrade' 'ninja')

package/archlinux/PKGBUILD-release

@@ -4,7 +4,7 @@ pkgver=dev.release
 pkgrel=1
 pkgdesc="C++11 and OpenGL 2D/3D graphics engine"
 arch=('i686' 'x86_64')
-url="https://github.com/mosra/magnum"
+url="http://mosra.cz/blog/magnum.php"
 license=('MIT')
 depends=('corrade' 'openal' 'sdl2' 'freeglut')
 makedepends=('cmake' 'ninja')

src/Math/TypeTraits.h

@@ -35,7 +35,7 @@
 
 /** @brief Precision when testing floats for equality */
 #ifndef FLOAT_EQUALITY_PRECISION
-#define FLOAT_EQUALITY_PRECISION 1.0e-6
+#define FLOAT_EQUALITY_PRECISION 1.0e-6f
 #endif
 
 /** @brief Precision when testing doubles for equality */
@@ -48,7 +48,7 @@
 @todo some proper value please
 */
 #ifndef LONG_DOUBLE_EQUALITY_PRECISION
-#define LONG_DOUBLE_EQUALITY_PRECISION 1.0e-18
+#define LONG_DOUBLE_EQUALITY_PRECISION 1.0e-18l
 #endif
 
 namespace Magnum { namespace Math {