From c543d9985deb8f693c0bfce050e2cb09dcb352ae Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 5 Jul 2016 15:00:37 +0000 Subject: [PATCH] Core: ValueType now allows later (in T) definition of type No git-svn-id: svn://ultimatepp.org/upp/trunk@10009 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Value.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/Core/Value.h b/uppsrc/Core/Value.h index 7f1c591b1..a15960178 100644 --- a/uppsrc/Core/Value.h +++ b/uppsrc/Core/Value.h @@ -53,8 +53,8 @@ template<> inline dword ValueTypeNo(const Value*) { return VALUE_V; } template class ValueType : public B { public: - static dword ValueTypeNo(const T*) { return type == UNKNOWN_V ? StaticTypeNo() + 0x8000000 : type; } - friend dword ValueTypeNo(const T*) { return T::ValueTypeNo(NULL); } + static dword ValueTypeNo() { return type == UNKNOWN_V ? StaticTypeNo() + 0x8000000 : type; } + friend dword ValueTypeNo(const T*) { return T::ValueTypeNo(); } bool IsNullInstance() const { return false; } void Serialize(Stream& s) { NEVER(); }