From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Fri, 28 Sep 2007 02:08:18 +0000 (+0000)
Subject: Commented out the deprecated angle type conversion operators.  They weren't used... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=4dd6c6c11c69d048bd14cddf9c4336017dcd6ea7;p=synfig.git

Commented out the deprecated angle type conversion operators.  They weren't used anywhere (everything still compiles without them, anyway) and they were preventing the multiplication operators from working.  (g++ complains "error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second").


git-svn-id: http://svn.voria.com/code@792 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/ETL/trunk/ETL/_angle.h b/ETL/trunk/ETL/_angle.h
index 6b50095..1abf930 100644
--- a/ETL/trunk/ETL/_angle.h
+++ b/ETL/trunk/ETL/_angle.h
@@ -288,10 +288,10 @@ public:
 	rad dist(const angle &rhs)const { return angle::dist(rhs); }
 	value_type get()const { return v; }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::radians
-inline angle::rad::operator angle::value_type()const { return get(); }
+// inline angle::rad::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::deg	_angle.h	ETL/angle
@@ -308,10 +308,10 @@ public:
 	deg dist(const angle &rhs)const { return angle::dist(rhs); }
 	value_type get()const { return v*360/(PI*2); }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::degrees
-inline angle::deg::operator angle::value_type()const { return get(); }
+// inline angle::deg::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::rot	_angle.h	ETL/angle
@@ -328,10 +328,10 @@ public:
 	rot dist(const angle &rhs)const { return angle::dist(rhs); }
 	value_type get()const { return v/(PI*2); }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::rotations
-inline angle::rot::operator angle::value_type()const { return get(); }
+// inline angle::rot::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::sin	_angle.h	ETL/angle
@@ -348,10 +348,10 @@ public:
 	sin dist(const angle &rhs)const { return angle::dist(rhs); }
 	value_type get()const { return static_cast<value_type>(std::sin(v)); }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::sin
-inline angle::sin::operator angle::value_type()const { return get(); }
+// inline angle::sin::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::cos	_angle.h	ETL/angle
@@ -368,10 +368,10 @@ public:
 	cos dist(const angle &rhs)const { return angle::dist(rhs); }
 	value_type get()const { return (value_type)std::cos(v); }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::cos
-inline angle::cos::operator angle::value_type()const { return get(); }
+// inline angle::cos::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::tan	_angle.h	ETL/angle
@@ -389,10 +389,10 @@ public:
 	tan dist(const angle &rhs)const { return angle::dist(rhs); }
 	value_type get()const { return (value_type)std::tan(v); }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::tan
-inline angle::tan::operator angle::value_type()const { return get(); }
+// inline angle::tan::operator angle::value_type()const { return get(); }
 
 _ETL_END_NAMESPACE