diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:01:27 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:04:05 -0800 |
| commit | b873dc778f52461129b1e28fb12dd3d4a309851c (patch) | |
| tree | e82913bc549a83104ce8abfb518eca6cb6d8aa83 /system/include/libcxx/ext/__hash | |
| parent | 140ea9e81feb09d8f2559995c73d49a39424ef5d (diff) | |
| parent | e0268fa1035a718341c53921eee9318d4a8033cd (diff) | |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
src/preamble.js
Diffstat (limited to 'system/include/libcxx/ext/__hash')
| -rw-r--r-- | system/include/libcxx/ext/__hash | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/include/libcxx/ext/__hash b/system/include/libcxx/ext/__hash index f6ecfe36..04975bfd 100644 --- a/system/include/libcxx/ext/__hash +++ b/system/include/libcxx/ext/__hash @@ -19,10 +19,10 @@ namespace __gnu_cxx { using namespace std; -template <typename T> struct _LIBCPP_TYPE_VIS hash : public std::hash<T> +template <typename T> struct _LIBCPP_TYPE_VIS_ONLY hash : public std::hash<T> { }; -template <> struct _LIBCPP_TYPE_VIS hash<const char*> +template <> struct _LIBCPP_TYPE_VIS_ONLY hash<const char*> : public unary_function<const char*, size_t> { _LIBCPP_INLINE_VISIBILITY @@ -32,7 +32,7 @@ template <> struct _LIBCPP_TYPE_VIS hash<const char*> } }; -template <> struct _LIBCPP_TYPE_VIS hash<char *> +template <> struct _LIBCPP_TYPE_VIS_ONLY hash<char *> : public unary_function<char*, size_t> { _LIBCPP_INLINE_VISIBILITY |