Moved istream/ostream includes out of Vec3f, and reimpleted osg::Matrix*::compare.
This commit is contained in:
@@ -43,7 +43,7 @@ class OSG_EXPORT Matrixd
|
||||
|
||||
~Matrixd() {}
|
||||
|
||||
int compare(const Matrixd& m) const { return memcmp(_mat,m._mat,sizeof(_mat)); }
|
||||
int compare(const Matrixd& m) const;
|
||||
|
||||
bool operator < (const Matrixd& m) const { return compare(m)<0; }
|
||||
bool operator == (const Matrixd& m) const { return compare(m)==0; }
|
||||
|
||||
@@ -43,7 +43,7 @@ class OSG_EXPORT Matrixf
|
||||
|
||||
~Matrixf() {}
|
||||
|
||||
int compare(const Matrixf& m) const { return memcmp(_mat,m._mat,sizeof(_mat)); }
|
||||
int compare(const Matrixf& m) const;
|
||||
|
||||
bool operator < (const Matrixf& m) const { return compare(m)<0; }
|
||||
bool operator == (const Matrixf& m) const { return compare(m)==0; }
|
||||
|
||||
@@ -14,9 +14,6 @@
|
||||
#ifndef OSG_VEC3F
|
||||
#define OSG_VEC3F 1
|
||||
|
||||
#include <ostream>
|
||||
#include <istream>
|
||||
|
||||
#include <osg/Vec2f>
|
||||
#include <osg/Math>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user