From: Jake Staahl <jstaahl@snapchat.com>
Date: Fri, 7 May 2021 19:48:01 +0000 (-0700)
Subject: Remove static initializers caused by templated static member.
X-Git-Tag: submit/tizen/20220120.021815~1^2~1^2~45^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=158b13e0ba5c3e152129021b16fb797b5742a79b;p=platform%2Fupstream%2Fopencv.git

Remove static initializers caused by templated static member.
---

diff --git a/modules/flann/include/opencv2/flann/any.h b/modules/flann/include/opencv2/flann/any.h
index f5684e9962..4906fec081 100644
--- a/modules/flann/include/opencv2/flann/any.h
+++ b/modules/flann/include/opencv2/flann/any.h
@@ -167,17 +167,15 @@ class SinglePolicy
 
 public:
     static base_any_policy* get_policy();
-
-private:
-    static typename choose_policy<T>::type policy;
 };
 
-template <typename T>
-typename choose_policy<T>::type SinglePolicy<T>::policy;
-
 /// This function will return a different policy for each type.
 template <typename T>
-inline base_any_policy* SinglePolicy<T>::get_policy() { return &policy; }
+inline base_any_policy* SinglePolicy<T>::get_policy()
+{
+    static typename choose_policy<T>::type policy;
+    return &policy;
+}
 
 } // namespace anyimpl