Changeset 1401 for trunk/src/lol/math/vector.hTweet

Timestamp:

May 19, 2012, 2:42:33 AM (11 years ago)

Author:

sam

Message:

core: no longer deactivate std::ostream features on Android.

File:

• trunk/src/lol/math/vector.h (modified) (9 diffs)

trunk/src/lol/math/vector.h

@@ -19 +19 @@
 #include <stdint.h>
 #include <cmath>
-#if !defined __ANDROID__
-#   include <iostream>
-#endif
+#include <ostream>
+#include <algorithm>
 
 #include "lol/math/half.h"
@@ -236 +235 @@
     DECLARE_MEMBER_OPS(Vec2, x)
 
-#if !defined __ANDROID__
     template<typename U>
     friend std::ostream &operator<<(std::ostream &stream, Vec2<U> const &v);
-#endif
 };
 
@@ -270 +267 @@
 
     inline T norm() const { return length(*this); }
-#if !defined __ANDROID__
     template<typename U>
     friend std::ostream &operator<<(std::ostream &stream, Cmplx<U> const &v);
-#endif
 
     T x, y;
@@ -494 +489 @@
     DECLARE_MEMBER_OPS(Vec3, x)
 
-#if !defined __ANDROID__
     template<typename U>
     friend std::ostream &operator<<(std::ostream &stream, Vec3<U> const &v);
-#endif
 };
 
@@ -903 +896 @@
     DECLARE_MEMBER_OPS(Vec4, x)
 
-#if !defined __ANDROID__
     template<typename U>
     friend std::ostream &operator<<(std::ostream &stream, Vec4<U> const &v);
-#endif
 };
 
@@ -984 +975 @@
     }
 
-#if !defined __ANDROID__
     template<typename U>
     friend std::ostream &operator<<(std::ostream &stream, Quat<U> const &v);
-#endif
 
     /* XXX: storage order is wxyz, unlike vectors! */
@@ -1593 +1582 @@
     void printf() const;
 
-#if !defined __ANDROID__
     template<class U>
     friend std::ostream &operator<<(std::ostream &stream, Mat2<U> const &m);
-#endif
 
     inline Mat2<T> operator +(Mat2<T> const m) const
@@ -1718 +1705 @@
     void printf() const;
 
-#if !defined __ANDROID__
     template<class U>
     friend std::ostream &operator<<(std::ostream &stream, Mat3<U> const &m);
-#endif
 
     inline Mat3<T> operator +(Mat3<T> const m) const
@@ -1885 +1870 @@
     void printf() const;
 
-#if !defined __ANDROID__
     template<class U>
     friend std::ostream &operator<<(std::ostream &stream, Mat4<U> const &m);
-#endif
 
     inline Mat4<T> operator +(Mat4<T> const &m) const