anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Revert "fix: no implicit vector copy"

Browse Source 
Reason: Wrong branch
This reverts commit 2d88860244.
master
tszirr ago%!(EXTRA string=12 years)
parent 861d6d1933
commit 968c892f92
8 changed files with 0 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      glm/core/type_vec1.hpp
  2. 4
      glm/core/type_vec1.inl
  3. 4
      glm/core/type_vec2.hpp
  4. 4
      glm/core/type_vec2.inl
  5. 4
      glm/core/type_vec3.hpp
  6. 4
      glm/core/type_vec3.inl
  7. 4
      glm/core/type_vec4.hpp
  8. 4
      glm/core/type_vec4.inl

4
glm/core/type_vec1.hpp
Unescape View File

@ -78,9 +78,7 @@ 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
@ -118,9 +116,7 @@ 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
Unescape View File

@ -73,7 +73,6 @@ 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
( (
@ -81,7 +80,6 @@ namespace detail
) : ) :
x(v.x) x(v.x)
{} {}
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -150,7 +148,6 @@ 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=
( (
@ -160,7 +157,6 @@ 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
Unescape View File

@ -107,9 +107,7 @@ 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
@ -162,9 +160,7 @@ 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
Unescape View File

@ -76,7 +76,6 @@ 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
( (
@ -85,7 +84,6 @@ namespace detail
x(v.x), x(v.x),
y(v.y) y(v.y)
{} {}
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -181,7 +179,6 @@ 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=
( (
@ -192,7 +189,6 @@ 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
Unescape View File

@ -108,9 +108,7 @@ 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
@ -186,9 +184,7 @@ 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
Unescape View File

@ -77,7 +77,6 @@ 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
( (
@ -87,7 +86,6 @@ namespace detail
y(v.y), y(v.y),
z(v.z) z(v.z)
{} {}
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -230,7 +228,6 @@ 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=
( (
@ -242,7 +239,6 @@ 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
Unescape View File

@ -109,9 +109,7 @@ 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
@ -241,9 +239,7 @@ 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
Unescape View File

@ -78,7 +78,6 @@ 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
( (
@ -89,7 +88,6 @@ namespace detail
z(v.z), z(v.z),
w(v.w) w(v.w)
{} {}
#endif
////////////////////////////////////// //////////////////////////////////////
// Explicit basic constructors // Explicit basic constructors
@ -369,7 +367,6 @@ 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=
( (
@ -382,7 +379,6 @@ 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>

Write Preview
Loading…
Cancel
Save