X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvalue.h;h=cc6cab9337fd7942af7e557a9962d60a1524a961;hb=b0e6321a71070ffc18476dd76b0fa320916f3edd;hp=0195db53d4fbfa87f0ec6a5e2f22c790e9571a7c;hpb=43d96678e1fd5cd3b22f7c2cf3adc7d362a2b684;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/value.h b/synfig-core/trunk/src/synfig/value.h index 0195db5..cc6cab9 100644 --- a/synfig-core/trunk/src/synfig/value.h +++ b/synfig-core/trunk/src/synfig/value.h @@ -6,7 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** Copyright (c) 2007 Chris Moore +** Copyright (c) 2007, 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -226,7 +226,7 @@ public: // === GET MEMBERS ======================================================== template - const T &get(const T& x)const + const T &get(const T& x __attribute__ ((unused)))const { assert(is_valid() && same_type_as(x)); return *static_cast(data); @@ -288,26 +288,26 @@ public: // === GET TYPE MEMBERS =================================================== - static const Type get_type(bool) { return TYPE_BOOL; } - static const Type get_type(int) { return TYPE_INTEGER; } - static const Type get_type(const Time&) { return TYPE_TIME; } - static const Type get_type(const Real&) { return TYPE_REAL; } - static const Type get_type(const float&) { return TYPE_REAL; } - static const Type get_type(const Vector&) { return TYPE_VECTOR; } - static const Type get_type(const Color&) { return TYPE_COLOR; } - static const Type get_type(const Segment&) { return TYPE_SEGMENT; } - static const Type get_type(const BLinePoint&) { return TYPE_BLINEPOINT; } - static const Type get_type(const String&) { return TYPE_STRING; } - static const Type get_type(const Gradient&) { return TYPE_GRADIENT; } - static const Type get_type(Canvas*) { return TYPE_CANVAS; } - static const Type get_type(const etl::handle&) + static Type get_type(bool) { return TYPE_BOOL; } + static Type get_type(int) { return TYPE_INTEGER; } + static Type get_type(const Time&) { return TYPE_TIME; } + static Type get_type(const Real&) { return TYPE_REAL; } + static Type get_type(const float&) { return TYPE_REAL; } + static Type get_type(const Vector&) { return TYPE_VECTOR; } + static Type get_type(const Color&) { return TYPE_COLOR; } + static Type get_type(const Segment&) { return TYPE_SEGMENT; } + static Type get_type(const BLinePoint&) { return TYPE_BLINEPOINT; } + static Type get_type(const String&) { return TYPE_STRING; } + static Type get_type(const Gradient&) { return TYPE_GRADIENT; } + static Type get_type(Canvas*) { return TYPE_CANVAS; } + static Type get_type(const etl::handle&) { return TYPE_CANVAS; } - static const Type get_type(const etl::loose_handle&) + static Type get_type(const etl::loose_handle&) { return TYPE_CANVAS; } - static const Type get_type(const list_type&) { return TYPE_LIST; } - template static const Type get_type(const std::vector &/*x*/) + static Type get_type(const list_type&) { return TYPE_LIST; } + template static Type get_type(const std::vector &/*x*/) { return TYPE_LIST; } - template static const Type get_type(const std::list &/*x*/) + template static Type get_type(const std::list &/*x*/) { return TYPE_LIST; } // ======================================================================== @@ -341,13 +341,13 @@ public: half get(const half &)const { return get(Real()); } void put(half*x)const { *x=get(Real()); } void set(const half &x) { _set(Real(x)); } - static const Type get_type(const half&) { return TYPE_REAL; } + static Type get_type(const half&) { return TYPE_REAL; } operator half()const { return get(Real()); } #endif #ifndef SYNFIG_NO_ANGLE operator const Angle&()const { return get(Angle()); } - static const Type get_type(const Angle&) { return TYPE_ANGLE; } + static Type get_type(const Angle&) { return TYPE_ANGLE; } #endif template