diff options
Diffstat (limited to 'contrib/libc++/include/ext')
| -rw-r--r-- | contrib/libc++/include/ext/__hash | 24 | ||||
| -rw-r--r-- | contrib/libc++/include/ext/hash_map | 26 | ||||
| -rw-r--r-- | contrib/libc++/include/ext/hash_set | 4 | 
3 files changed, 27 insertions, 27 deletions
diff --git a/contrib/libc++/include/ext/__hash b/contrib/libc++/include/ext/__hash index 5675d54055e0..318cb1f97b02 100644 --- a/contrib/libc++/include/ext/__hash +++ b/contrib/libc++/include/ext/__hash @@ -19,9 +19,9 @@  namespace __gnu_cxx {  using namespace std; -template <typename _Tp> struct _LIBCPP_TYPE_VIS_ONLY hash { }; +template <typename _Tp> struct _LIBCPP_TEMPLATE_VIS hash { }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<const char*> +template <> struct _LIBCPP_TEMPLATE_VIS hash<const char*>      : public unary_function<const char*, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -31,7 +31,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<const char*>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<char *> +template <> struct _LIBCPP_TEMPLATE_VIS hash<char *>      : public unary_function<char*, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -41,7 +41,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<char *>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<char> +template <> struct _LIBCPP_TEMPLATE_VIS hash<char>      : public unary_function<char, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -51,7 +51,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<char>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<signed char> +template <> struct _LIBCPP_TEMPLATE_VIS hash<signed char>      : public unary_function<signed char, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -61,7 +61,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<signed char>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned char> +template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned char>      : public unary_function<unsigned char, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -71,7 +71,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned char>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<short> +template <> struct _LIBCPP_TEMPLATE_VIS hash<short>      : public unary_function<short, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -81,7 +81,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<short>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned short> +template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned short>      : public unary_function<unsigned short, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -91,7 +91,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned short>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<int> +template <> struct _LIBCPP_TEMPLATE_VIS hash<int>      : public unary_function<int, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -101,7 +101,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<int>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned int> +template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned int>      : public unary_function<unsigned int, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -111,7 +111,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned int>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<long> +template <> struct _LIBCPP_TEMPLATE_VIS hash<long>      : public unary_function<long, size_t>  {      _LIBCPP_INLINE_VISIBILITY @@ -121,7 +121,7 @@ template <> struct _LIBCPP_TYPE_VIS_ONLY hash<long>      }  }; -template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned long> +template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned long>      : public unary_function<unsigned long, size_t>  {      _LIBCPP_INLINE_VISIBILITY diff --git a/contrib/libc++/include/ext/hash_map b/contrib/libc++/include/ext/hash_map index 5e1e9f542b17..8998bec66c31 100644 --- a/contrib/libc++/include/ext/hash_map +++ b/contrib/libc++/include/ext/hash_map @@ -364,7 +364,7 @@ public:  };  template <class _HashIterator> -class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator +class _LIBCPP_TEMPLATE_VIS __hash_map_iterator  {      _HashIterator __i_; @@ -401,15 +401,15 @@ public:      bool operator!=(const __hash_map_iterator& __x, const __hash_map_iterator& __y)          {return __x.__i_ != __y.__i_;} -    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY hash_map; -    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY hash_multimap; -    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator; -    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator; -    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator; +    template <class, class, class, class, class> friend class _LIBCPP_TEMPLATE_VIS hash_map; +    template <class, class, class, class, class> friend class _LIBCPP_TEMPLATE_VIS hash_multimap; +    template <class> friend class _LIBCPP_TEMPLATE_VIS __hash_const_iterator; +    template <class> friend class _LIBCPP_TEMPLATE_VIS __hash_const_local_iterator; +    template <class> friend class _LIBCPP_TEMPLATE_VIS __hash_map_const_iterator;  };  template <class _HashIterator> -class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator +class _LIBCPP_TEMPLATE_VIS __hash_map_const_iterator  {      _HashIterator __i_; @@ -454,15 +454,15 @@ public:      bool operator!=(const __hash_map_const_iterator& __x, const __hash_map_const_iterator& __y)          {return __x.__i_ != __y.__i_;} -    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY hash_map; -    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY hash_multimap; -    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator; -    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator; +    template <class, class, class, class, class> friend class _LIBCPP_TEMPLATE_VIS hash_map; +    template <class, class, class, class, class> friend class _LIBCPP_TEMPLATE_VIS hash_multimap; +    template <class> friend class _LIBCPP_TEMPLATE_VIS __hash_const_iterator; +    template <class> friend class _LIBCPP_TEMPLATE_VIS __hash_const_local_iterator;  };  template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,            class _Alloc = allocator<pair<const _Key, _Tp> > > -class _LIBCPP_TYPE_VIS_ONLY hash_map +class _LIBCPP_TEMPLATE_VIS hash_map  {  public:      // types @@ -736,7 +736,7 @@ operator!=(const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,  template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,            class _Alloc = allocator<pair<const _Key, _Tp> > > -class _LIBCPP_TYPE_VIS_ONLY hash_multimap +class _LIBCPP_TEMPLATE_VIS hash_multimap  {  public:      // types diff --git a/contrib/libc++/include/ext/hash_set b/contrib/libc++/include/ext/hash_set index 91850b566d5b..7c6a8bf0ccc7 100644 --- a/contrib/libc++/include/ext/hash_set +++ b/contrib/libc++/include/ext/hash_set @@ -212,7 +212,7 @@ using namespace std;  template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,            class _Alloc = allocator<_Value> > -class _LIBCPP_TYPE_VIS_ONLY hash_set +class _LIBCPP_TEMPLATE_VIS hash_set  {  public:      // types @@ -434,7 +434,7 @@ operator!=(const hash_set<_Value, _Hash, _Pred, _Alloc>& __x,  template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,            class _Alloc = allocator<_Value> > -class _LIBCPP_TYPE_VIS_ONLY hash_multiset +class _LIBCPP_TEMPLATE_VIS hash_multiset  {  public:      // types  | 
