From aa6e9937340fb24ee01dc5eeb9bd143d0f213c56 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Mon, 27 May 2013 21:05:12 -0500 Subject: [PATCH] clang compile --- Foundation/include/Poco/Dynamic/Struct.h | 2 +- Foundation/include/Poco/Dynamic/Var.h | 2 +- Foundation/include/Poco/Dynamic/VarHolder.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Foundation/include/Poco/Dynamic/Struct.h b/Foundation/include/Poco/Dynamic/Struct.h index cdcd8b66d..23a5a42cf 100644 --- a/Foundation/include/Poco/Dynamic/Struct.h +++ b/Foundation/include/Poco/Dynamic/Struct.h @@ -64,7 +64,7 @@ public: typedef typename Struct::Data::value_type ValueType; typedef typename Struct::Data::size_type SizeType; typedef typename std::pair::Iterator, bool> InsRetVal; - typedef typename SharedPtr > Ptr; + typedef typename SharedPtr > Ptr; Struct(): _data() /// Creates an empty Struct diff --git a/Foundation/include/Poco/Dynamic/Var.h b/Foundation/include/Poco/Dynamic/Var.h index e8a5c1d0c..8f44322bb 100644 --- a/Foundation/include/Poco/Dynamic/Var.h +++ b/Foundation/include/Poco/Dynamic/Var.h @@ -522,7 +522,7 @@ public: bool isString() const; /// Returns true if stored value is std::string. - std::size_t Var::size() const; + std::size_t size() const; /// Returns the size of this Var. /// This function returns 0 when Var is empty, 1 for POD or the size (i.e. length) /// for held container. diff --git a/Foundation/include/Poco/Dynamic/VarHolder.h b/Foundation/include/Poco/Dynamic/VarHolder.h index ae90c8067..69a0ca255 100644 --- a/Foundation/include/Poco/Dynamic/VarHolder.h +++ b/Foundation/include/Poco/Dynamic/VarHolder.h @@ -2856,8 +2856,8 @@ public: if (n >= size()) throw RangeException("List index out of range"); - std::list::size_type counter = 0; - std::list::iterator it = _val.begin(); + typename std::list::size_type counter = 0; + typename std::list::iterator it = _val.begin(); for (; counter < n; ++counter) ++it; return *it; @@ -2868,8 +2868,8 @@ public: if (n >= size()) throw RangeException("List index out of range"); - std::list::size_type counter = 0; - std::list::const_iterator it = _val.begin(); + typename std::list::size_type counter = 0; + typename std::list::const_iterator it = _val.begin(); for (; counter < n; ++counter) ++it; return *it;