Commit 41b165d4 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'cpp11' into 'master'

Cpp11



See merge request !28
parents 146a64bb c08efb86
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#include <ACG/GL/acg_glew.hh> #include <ACG/GL/acg_glew.hh>
#include "GLState.hh" #include "GLState.hh"
#include <cstring>
//== NAMESPACES =============================================================== //== NAMESPACES ===============================================================
......
...@@ -82,10 +82,10 @@ class QuaternionT : public VectorT<Scalar,4> ...@@ -82,10 +82,10 @@ class QuaternionT : public VectorT<Scalar,4>
{ {
public: public:
#define W Base::values_[0] #define W Base::data()[0]
#define X Base::values_[1] #define X Base::data()[1]
#define Y Base::values_[2] #define Y Base::data()[2]
#define Z Base::values_[3] #define Z Base::data()[3]
typedef VectorT<Scalar,4> Base; typedef VectorT<Scalar,4> Base;
......
...@@ -76,6 +76,8 @@ ...@@ -76,6 +76,8 @@
#include <cstdlib> #include <cstdlib>
#endif #endif
#include <cstring>
#ifdef USE_OPENMP #ifdef USE_OPENMP
#include <omp.h> #include <omp.h>
#endif #endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment