Merged most of the changes from trunk.

Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.
This commit is contained in:
Michał W. Urbańczyk
2008-08-02 15:08:03 +00:00
parent dc82232e70
commit cc7be20b07
79 changed files with 1635 additions and 721 deletions
+5 -5
View File
@@ -35,7 +35,7 @@ public:
x+=i.x;
y+=i.y;
z+=i.z;
}
}
inline void operator+=(const si32 & i)
{
x+=i;
@@ -47,15 +47,15 @@ public:
x-=i.x;
y-=i.y;
z-=i.z;
}
}
inline void operator-=(const si32 & i)
{
x+=i;
y+=i;
z+=i;
}
}
inline bool operator==(const int3 & i) const
{return (x==i.x) && (y==i.y) && (z==i.z);}
{return (x==i.x) && (y==i.y) && (z==i.z);}
inline bool operator!=(const int3 & i) const
{return !(*this==i);}
inline bool operator<(const int3 & i) const
@@ -88,4 +88,4 @@ inline std::ostream & operator<<(std::ostream & str, const int3 & sth)
{
return str<<sth.x<<' '<<sth.y<<' '<<sth.z;
}
#endif //INT3_H
#endif //INT3_H