diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:55:19 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:56:03 -0800 |
| commit | cd1edebb5034ea52396a5b68304e84ae80878740 (patch) | |
| tree | 6a6f8364ea74985d11c4f6ff74e5b80e08dc849d /system/include/libcxx/ext/__hash | |
| parent | af59788f8b7b76515e36bee1bf66edf497b801db (diff) | |
| parent | 2914deb17f3857bb02eeec87a58a3ed6d4a8853a (diff) | |
Merge branch 'incoming' of github.com:kripken/emscripten into incoming1.8.8
conflicts: tests/test_core.py tools/shared.py
Diffstat (limited to 'system/include/libcxx/ext/__hash')
| -rw-r--r-- | system/include/libcxx/ext/__hash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/include/libcxx/ext/__hash b/system/include/libcxx/ext/__hash index 04975bfd..c0523cce 100644 --- a/system/include/libcxx/ext/__hash +++ b/system/include/libcxx/ext/__hash @@ -19,7 +19,7 @@ namespace __gnu_cxx { using namespace std; -template <typename T> struct _LIBCPP_TYPE_VIS_ONLY hash : public std::hash<T> +template <typename _Tp> struct _LIBCPP_TYPE_VIS_ONLY hash : public std::hash<_Tp> { }; template <> struct _LIBCPP_TYPE_VIS_ONLY hash<const char*> |