Changeset 1401Tweet

Timestamp:

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

Author:

sam

Message:

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

Location:

trunk/src

Files:

• gpu/vertexbuffer.cpp (modified) (5 diffs)
• lol/math/vector.h (modified) (9 diffs)
• math/vector.cpp (modified) (3 diffs)

trunk/src/gpu/vertexbuffer.cpp

@@ -47 +47 @@
 #elif defined _XBOX
     D3DVertexBuffer *m_vbo;
-#elif !defined __ANDROID__
+#else
     GLuint m_vbo;
     uint8_t *m_memory;
@@ -474 +474 @@
                                                D3DPOOL_MANAGED, &m_data->m_vbo, NULL)))
         Abort();
-#elif !defined __CELLOS_LV2__ && !defined __ANDROID__
+#elif !defined __CELLOS_LV2__
     glGenBuffers(1, &m_data->m_vbo);
     m_data->m_memory = new uint8_t[size];
@@ -486 +486 @@
     if (FAILED(m_data->m_vbo->Release()))
         Abort();
-#elif !defined __CELLOS_LV2__ && !defined __ANDROID__
+#elif !defined __CELLOS_LV2__
     glDeleteBuffers(1, &m_data->m_vbo);
     delete[] m_data->m_memory;
@@ -500 +500 @@
         Abort();
     return ret;
-#elif !defined __CELLOS_LV2__ && !defined __ANDROID__
+#elif !defined __CELLOS_LV2__
     return m_data->m_memory + offset;
 #endif
@@ -510 +510 @@
     if (FAILED(m_data->m_vbo->Unlock()))
         Abort();
-#elif !defined __CELLOS_LV2__ && !defined __ANDROID__
+#elif !defined __CELLOS_LV2__
     glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
     glBufferData(GL_ARRAY_BUFFER, m_data->m_size, m_data->m_memory,

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

trunk/src/math/vector.cpp

@@ -30 +30 @@
 #include <cstring> /* strdup() */
 
+#include <ostream> /* std::ostream */
+
 #include "core.h"
 
@@ -238 +240 @@
 }
 
-#if !defined __ANDROID__
 template<> std::ostream &operator<<(std::ostream &stream, ivec2 const &v)
 {
@@ -305 +306 @@
     return stream;
 }
-#endif
 
 template<> mat3 mat3::scale(float x, float y, float z)