From: Marius Muja Date: Mon, 9 Jan 2012 21:31:51 +0000 (+0000) Subject: Fixing ticket #1539 X-Git-Tag: accepted/2.0/20130307.220821~1477 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63efa5b2de626e2669859bfbe7e03a6570213600;p=profile%2Fivi%2Fopencv.git Fixing ticket #1539 --- diff --git a/modules/flann/include/opencv2/flann/any.h b/modules/flann/include/opencv2/flann/any.h index b9b4e49..34a7120 100644 --- a/modules/flann/include/opencv2/flann/any.h +++ b/modules/flann/include/opencv2/flann/any.h @@ -43,7 +43,7 @@ struct base_any_policy virtual void clone(void* const* src, void** dest) = 0; virtual void move(void* const* src, void** dest) = 0; virtual void* get_value(void** src) = 0; - virtual size_t get_size() = 0; + virtual ::size_t get_size() = 0; virtual const std::type_info& type() = 0; virtual void print(std::ostream& out, void* const* src) = 0; }; @@ -51,7 +51,7 @@ struct base_any_policy template struct typed_base_any_policy : base_any_policy { - virtual size_t get_size() { return sizeof(T); } + virtual ::size_t get_size() { return sizeof(T); } virtual const std::type_info& type() { return typeid(T); } };