Stellarium

Merge lp:~hacker-emmanuel/stellarium/bug_1178391 into lp:stellarium

  1. bug_1178391
  2. Merge into trunk
Proposed by Emmanuel
Status: Merged
Approved by: Alexander Wolf
Approved revision: 5790
Merged at revision: 6026
Proposed branch: lp:~hacker-emmanuel/stellarium/bug_1178391
Merge into: lp:stellarium
Diff against target: 27 lines (+10/-0)
1 file modified
src/core/VecMath.hpp (+10/-0)
To merge this branch: bzr merge lp:~hacker-emmanuel/stellarium/bug_1178391
Reviewer Review Type Date Requested Status
Stellarium Pending
Review via email: mp+163209@code.launchpad.net

Description of the change

add missing definition of operator/= for Vector4 and Vector2

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/core/VecMath.hpp'
--- src/core/VecMath.hpp 2013-05-09 13:29:35 +0000
+++ src/core/VecMath.hpp 2013-05-09 19:40:32 +0000
@@ -356,6 +356,11 @@
356 v[0] *= s; v[1] *= s;356 v[0] *= s; v[1] *= s;
357}357}
358358
359template<class T> void Vector2<T>::operator/=(T s)
360{
361 v[0] /= s; v[1] /= s;
362}
363
359template<class T> Vector2<T> Vector2<T>::operator-() const364template<class T> Vector2<T> Vector2<T>::operator-() const
360{365{
361 return Vector2<T>(-v[0], -v[1]);366 return Vector2<T>(-v[0], -v[1]);
@@ -703,6 +708,11 @@
703 v[0] *= s; v[1] *= s; v[2] *= s; v[3] *= s;708 v[0] *= s; v[1] *= s; v[2] *= s; v[3] *= s;
704}709}
705710
711template<class T> void Vector4<T>::operator/=(T s)
712{
713 v[0] /= s; v[1] /= s; v[2] /= s; v[3] /= s;
714}
715
706template<class T> Vector4<T> Vector4<T>::operator-() const716template<class T> Vector4<T> Vector4<T>::operator-() const
707{717{
708 return Vector4<T>(-v[0], -v[1], -v[2], -v[3]);718 return Vector4<T>(-v[0], -v[1], -v[2], -v[3]);