X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fdevel-api%2Fcommon%2Fmap-wrapper.h;h=c02dd3964cf948568c9c21aeb4bc84647f1970ab;hb=9f84a74302fdd8d0b8ef6c65cd8674e816e3055f;hp=070f0e9f2aabc0cd4d1a2349240eacab4d61dfa2;hpb=0495953dba33e35e17d01887f4bf01dc96f7eb4b;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/devel-api/common/map-wrapper.h b/dali/devel-api/common/map-wrapper.h
index 070f0e9..c02dd39 100644
--- a/dali/devel-api/common/map-wrapper.h
+++ b/dali/devel-api/common/map-wrapper.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_MAP_H__
-#define __DALI_MAP_H__
+#ifndef DALI_MAP_WRAPPER_H
+#define DALI_MAP_WRAPPER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,30 +18,47 @@
  *
  */
 
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
-
 #ifndef HIDE_DALI_INTERNALS
 
-# include <map>
+#include <map>
 
 #else
 
-// ensure that default visibility is used with any class that is used as an exception type
-# include <memory>
-# include <new>
-# include <stdexcept>
+// Ensure that default visibility is used with any class that is used as an exception type
+#include <memory>
+#include <new>
+#include <stdexcept>
+
+#if defined(__clang__)
+
+#undef _LIBCPP_INLINE_VISIBILITY
+#define _LIBCPP_INLINE_VISIBILITY
+#undef _LIBCPP_EXTERN_TEMPLATE
+#define _LIBCPP_EXTERN_TEMPLATE(...)
+
+#include <map>
+
+#undef _LIBCPP_INLINE_VISIBILITY
+#define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__visibility__("hidden"), __always_inline__))
+#undef _LIBCPP_EXTERN_TEMPLATE
+#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
+
+#else
 
-# include <bits/c++config.h>
-# include <bits/stl_tree.h>
-# undef _GLIBCXX_VISIBILITY_ATTR
-# define _GLIBCXX_VISIBILITY_ATTR(V) __attribute__ ((__visibility__ ("hidden")))
-# include <map>
-# undef _GLIBCXX_VISIBILITY_ATTR
-# define _GLIBCXX_VISIBILITY_ATTR(V) __attribute__ ((__visibility__ (#V))) // restore `_GLIBCXX_VISIBILITY_ATTR`
+#include <bits/c++config.h>
+#include <bits/stl_tree.h>
+#undef _GLIBCXX_VISIBILITY_ATTR
+#undef _GLIBCXX_VISIBILITY
+#define _GLIBCXX_VISIBILITY_ATTR(V) __attribute__ ((__visibility__ ("hidden")))
+#define _GLIBCXX_VISIBILITY(V) __attribute__ ((__visibility__ ("hidden")))
+#include <map>
+#undef _GLIBCXX_VISIBILITY_ATTR
+#undef _GLIBCXX_VISIBILITY
+#define _GLIBCXX_VISIBILITY_ATTR(V) __attribute__ ((__visibility__ (#V))) // restore `_GLIBCXX_VISIBILITY_ATTR`
+#define _GLIBCXX_VISIBILITY(V) __attribute__ ((__visibility__ (#V))) // restore `_GLIBCXX_VISIBILITY`
 
-#endif //ifndef HIDE_DALI_INTERNALS
+#endif // #ifdef __clang__
 
+#endif // #ifndef HIDE_DALI_INTERNALS
 
-#endif /* __DALI_MAP_H__ */
+#endif // DALI_MAP_WRAPPER_H