mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-30 03:44:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: no implicit vector copy

Browse Source
This commit is contained in:
tszirr 2013-06-24 11:45:19 +02:00
parent b016594ac3
commit 2d88860244
8 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/core/type_vec1.hpp
View File

@ -78,7 +78,9 @@ namespace detail
// Implicit basic constructors // Implicit basic constructors
GLM_FUNC_DECL tvec1(); GLM_FUNC_DECL tvec1();
#ifndef GLM_NO_EXPLICIT_COPY
GLM_FUNC_DECL tvec1(tvec1<T> const & v); GLM_FUNC_DECL tvec1(tvec1<T> const & v);
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -116,7 +118,9 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Unary arithmetic operators // Unary arithmetic operators
#ifndef GLM_NO_EXPLICIT_COPY
GLM_FUNC_DECL tvec1<T> & operator= (tvec1<T> const & v); GLM_FUNC_DECL tvec1<T> & operator= (tvec1<T> const & v);
#endif
template <typename U> template <typename U>
GLM_FUNC_DECL tvec1<T> & operator= (tvec1<U> const & v); GLM_FUNC_DECL tvec1<T> & operator= (tvec1<U> const & v);

4
glm/core/type_vec1.inl
View File

@ -73,6 +73,7 @@ namespace detail
) )
{} {}
#ifndef GLM_NO_EXPLICIT_COPY
template <typename T> template <typename T>
GLM_FUNC_QUALIFIER tvec1<T>::tvec1 GLM_FUNC_QUALIFIER tvec1<T>::tvec1
( (
@ -80,6 +81,7 @@ namespace detail
) : ) :
x(v.x) x(v.x)
{} {}
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -148,6 +150,7 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Unary arithmetic operators // Unary arithmetic operators
#ifndef GLM_NO_EXPLICIT_COPY
template <typename T> template <typename T>
GLM_FUNC_QUALIFIER tvec1<T> & tvec1<T>::operator= GLM_FUNC_QUALIFIER tvec1<T> & tvec1<T>::operator=
( (
@ -157,6 +160,7 @@ namespace detail
this->x = v.x; this->x = v.x;
return *this; return *this;
} }
#endif
template <typename T> template <typename T>
template <typename U> template <typename U>

4
glm/core/type_vec2.hpp
View File

@ -107,7 +107,9 @@ namespace detail
// Implicit basic constructors // Implicit basic constructors
GLM_FUNC_DECL tvec2(); GLM_FUNC_DECL tvec2();
#ifndef GLM_NO_EXPLICIT_COPY
GLM_FUNC_DECL tvec2(tvec2<T> const & v); GLM_FUNC_DECL tvec2(tvec2<T> const & v);
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -160,7 +162,9 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Unary arithmetic operators // Unary arithmetic operators
#ifndef GLM_NO_EXPLICIT_COPY
GLM_FUNC_DECL tvec2<T> & operator= (tvec2<T> const & v); GLM_FUNC_DECL tvec2<T> & operator= (tvec2<T> const & v);
#endif
template <typename U> template <typename U>
GLM_FUNC_DECL tvec2<T> & operator= (tvec2<U> const & v); GLM_FUNC_DECL tvec2<T> & operator= (tvec2<U> const & v);

4
glm/core/type_vec2.inl
View File

@ -76,6 +76,7 @@ namespace detail
) )
{} {}
#ifndef GLM_NO_EXPLICIT_COPY
template <typename T> template <typename T>
GLM_FUNC_QUALIFIER tvec2<T>::tvec2 GLM_FUNC_QUALIFIER tvec2<T>::tvec2
( (
@ -84,6 +85,7 @@ namespace detail
x(v.x), x(v.x),
y(v.y) y(v.y)
{} {}
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -179,6 +181,7 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Unary arithmetic operators // Unary arithmetic operators
#ifndef GLM_NO_EXPLICIT_COPY
template <typename T> template <typename T>
GLM_FUNC_QUALIFIER tvec2<T> & tvec2<T>::operator= GLM_FUNC_QUALIFIER tvec2<T> & tvec2<T>::operator=
( (
@ -189,6 +192,7 @@ namespace detail
this->y = v.y; this->y = v.y;
return *this; return *this;
} }
#endif
template <typename T> template <typename T>
template <typename U> template <typename U>

4
glm/core/type_vec3.hpp
View File

@ -108,7 +108,9 @@ namespace detail
// Implicit basic constructors // Implicit basic constructors
GLM_FUNC_DECL tvec3(); GLM_FUNC_DECL tvec3();
#ifndef GLM_NO_EXPLICIT_COPY
GLM_FUNC_DECL tvec3(tvec3<T> const & v); GLM_FUNC_DECL tvec3(tvec3<T> const & v);
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -184,7 +186,9 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Unary arithmetic operators // Unary arithmetic operators
#ifndef GLM_NO_EXPLICIT_COPY
GLM_FUNC_DECL tvec3<T> & operator= (tvec3<T> const & v); GLM_FUNC_DECL tvec3<T> & operator= (tvec3<T> const & v);
#endif
template <typename U> template <typename U>
GLM_FUNC_DECL tvec3<T> & operator= (tvec3<U> const & v); GLM_FUNC_DECL tvec3<T> & operator= (tvec3<U> const & v);

4
glm/core/type_vec3.inl
View File

@ -77,6 +77,7 @@ namespace detail
) )
{} {}
#ifndef GLM_NO_EXPLICIT_COPY
template <typename T> template <typename T>
GLM_FUNC_QUALIFIER tvec3<T>::tvec3 GLM_FUNC_QUALIFIER tvec3<T>::tvec3
( (
@ -86,6 +87,7 @@ namespace detail
y(v.y), y(v.y),
z(v.z) z(v.z)
{} {}
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -228,6 +230,7 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Unary arithmetic operators // Unary arithmetic operators
#ifndef GLM_NO_EXPLICIT_COPY
template <typename T> template <typename T>
GLM_FUNC_QUALIFIER tvec3<T>& tvec3<T>::operator= GLM_FUNC_QUALIFIER tvec3<T>& tvec3<T>::operator=
( (
@ -239,6 +242,7 @@ namespace detail
this->z = v.z; this->z = v.z;
return *this; return *this;
} }
#endif
template <typename T> template <typename T>
template <typename U> template <typename U>

4
glm/core/type_vec4.hpp
View File

@ -109,7 +109,9 @@ namespace detail
// Implicit basic constructors // Implicit basic constructors
GLM_FUNC_DECL tvec4(); GLM_FUNC_DECL tvec4();
#ifndef GLM_NO_EXPLICIT_COPY
GLM_FUNC_DECL tvec4(type const & v); GLM_FUNC_DECL tvec4(type const & v);
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -239,7 +241,9 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Unary arithmetic operators // Unary arithmetic operators
#ifndef GLM_NO_EXPLICIT_COPY
GLM_FUNC_DECL tvec4<T> & operator= (tvec4<T> const & v); GLM_FUNC_DECL tvec4<T> & operator= (tvec4<T> const & v);
#endif
template <typename U> template <typename U>
GLM_FUNC_DECL tvec4<T> & operator= (tvec4<U> const & v); GLM_FUNC_DECL tvec4<T> & operator= (tvec4<U> const & v);

4
glm/core/type_vec4.inl
View File

@ -78,6 +78,7 @@ namespace detail
) )
{} {}
#ifndef GLM_NO_EXPLICIT_COPY
template <typename T> template <typename T>
GLM_FUNC_QUALIFIER tvec4<T>::tvec4 GLM_FUNC_QUALIFIER tvec4<T>::tvec4
( (
@ -88,6 +89,7 @@ namespace detail
z(v.z), z(v.z),
w(v.w) w(v.w)
{} {}
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -367,6 +369,7 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Unary arithmetic operators // Unary arithmetic operators
#ifndef GLM_NO_EXPLICIT_COPY
template <typename T> template <typename T>
GLM_FUNC_QUALIFIER tvec4<T> & tvec4<T>::operator= GLM_FUNC_QUALIFIER tvec4<T> & tvec4<T>::operator=
( (
@ -379,6 +382,7 @@ namespace detail
this->w = v.w; this->w = v.w;
return *this; return *this;
} }
#endif
template <typename T> template <typename T>
template <typename U> template <typename U>