Mesa (master): d3d1x: fix GCC 4.1/4.2 build
Luca Barbieri
lb at kemper.freedesktop.org
Tue Sep 21 20:50:35 UTC 2010
Module: Mesa
Branch: master
Commit: c02bf8162981c4b6287098bc33e954519d414326
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c02bf8162981c4b6287098bc33e954519d414326
Author: Luca Barbieri <luca at luca-barbieri.com>
Date: Tue Sep 21 22:47:09 2010 +0200
d3d1x: fix GCC 4.1/4.2 build
---
.../d3d1x/d3d1xstutil/include/d3d1xstutil.h | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
index ab195f1..19ac53e 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
+++ b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
@@ -781,12 +781,22 @@ namespace std
{
#endif
template<>
+ struct hash<GUID> : public std::unary_function<GUID, size_t>
+ {
+ inline size_t operator()(GUID __val) const;
+ };
+
inline size_t hash<GUID>::operator()(GUID __val) const
{
return raw_hash(__val);
}
template<>
+ struct hash<c_string> : public std::unary_function<c_string, size_t>
+ {
+ inline size_t operator()(c_string __val) const;
+ };
+
inline size_t hash<c_string>::operator()(c_string __val) const
{
return raw_hash(__val.p, strlen(__val.p));
@@ -795,7 +805,7 @@ namespace std
template<typename T, typename U>
struct hash<std::pair<T, U> > : public std::unary_function<std::pair<T, U>, size_t>
{
- size_t operator()(std::pair<T, U> __val) const;
+ inline size_t operator()(std::pair<T, U> __val) const;
};
template<typename T, typename U>
More information about the mesa-commit
mailing list