diff --git a/tools/pymol_asphere/src/cartesian.cpp b/tools/pymol_asphere/src/cartesian.cpp index 2328e97151..38550db0e7 100755 --- a/tools/pymol_asphere/src/cartesian.cpp +++ b/tools/pymol_asphere/src/cartesian.cpp @@ -18,36 +18,6 @@ #include "cartesian.h" -template class TwoD; -template class TwoD; -template class TwoD; -template ostream & operator<< (ostream &out, const TwoD &t); -template ostream & operator<< (ostream &out, const TwoD &t); -template istream & operator>> (istream &in, TwoD &t); -template istream & operator>> (istream &in, TwoD &t); -template class ThreeD; -template class ThreeD; -template class ThreeD; -template class ThreeD; -template ostream & operator<< (ostream &out, const ThreeD &t); -template istream & operator>> (istream &in, ThreeD &t); -template ostream & operator<< (ostream &out, const ThreeD &t); -template istream & operator>> (istream &in, ThreeD &t); -template ostream & operator<< (ostream &out, const ThreeD &t); -template istream & operator>> (istream &in, ThreeD &t); -template ThreeD operator+ (const unsigned one, - const ThreeD &two); -template ThreeD operator+(const double one, const ThreeD &two); -template ThreeD operator- (const unsigned one, - const ThreeD &two); -template ThreeD operator-(const double one, const ThreeD &two); -template ThreeD operator* (const unsigned one, - const ThreeD &two); -template ThreeD operator*(const double one, const ThreeD &two); -template ThreeD operator/ (const unsigned one, - const ThreeD &two); -template ThreeD operator/(const double one, const ThreeD &two); - // ------------------------ TwoD Stuff @@ -1044,4 +1014,34 @@ cPt c::mean(vector &vec) { return average/vec.size(); } +template class TwoD; +template class TwoD; +template class TwoD; +template ostream & operator<< (ostream &out, const TwoD &t); +template ostream & operator<< (ostream &out, const TwoD &t); +template istream & operator>> (istream &in, TwoD &t); +template istream & operator>> (istream &in, TwoD &t); +template class ThreeD; +template class ThreeD; +template class ThreeD; +template class ThreeD; +template ostream & operator<< (ostream &out, const ThreeD &t); +template istream & operator>> (istream &in, ThreeD &t); +template ostream & operator<< (ostream &out, const ThreeD &t); +template istream & operator>> (istream &in, ThreeD &t); +template ostream & operator<< (ostream &out, const ThreeD &t); +template istream & operator>> (istream &in, ThreeD &t); +template ThreeD operator+ (const unsigned one, + const ThreeD &two); +template ThreeD operator+(const double one, const ThreeD &two); +template ThreeD operator- (const unsigned one, + const ThreeD &two); +template ThreeD operator-(const double one, const ThreeD &two); +template ThreeD operator* (const unsigned one, + const ThreeD &two); +template ThreeD operator*(const double one, const ThreeD &two); +template ThreeD operator/ (const unsigned one, + const ThreeD &two); +template ThreeD operator/(const double one, const ThreeD &two); + diff --git a/tools/pymol_asphere/src/spherical.cpp b/tools/pymol_asphere/src/spherical.cpp index f209975dd6..427bb4a6e5 100755 --- a/tools/pymol_asphere/src/spherical.cpp +++ b/tools/pymol_asphere/src/spherical.cpp @@ -17,13 +17,6 @@ #include "spherical.h" -template class Ball; -template class Ball; -template ostream & operator<< (ostream &out, const Ball &t); -template ostream & operator<< (ostream &out, const Ball &t); -template istream & operator>> (istream &in, Ball &t); -template istream & operator>> (istream &in, Ball &t); - // Empty construct. Not necessarily initialized to [0 0] template Ball::Ball() { @@ -143,3 +136,12 @@ template bool Ball::check_bounds(numtyp min,numtyp max) { return true; } + +template class Ball; +template class Ball; +template ostream & operator<< (ostream &out, const Ball &t); +template ostream & operator<< (ostream &out, const Ball &t); +template istream & operator>> (istream &in, Ball &t); +template istream & operator>> (istream &in, Ball &t); + +