diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2013-04-08 14:40:21 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-04-17 16:56:52 -0500 |
| commit | 79f790c2b9d6a368f61a99af07d04ed9348ca504 (patch) | |
| tree | ad13d684f026aed530be76a2266730f9a31552f4 /src/include/utility | |
| parent | 24677286a33ea478fd5c2db959e894dd3a5f0e85 (diff) | |
| download | talos-hostboot-79f790c2b9d6a368f61a99af07d04ed9348ca504.tar.gz talos-hostboot-79f790c2b9d6a368f61a99af07d04ed9348ca504.zip | |
Fixes for GCC 4.7
Change-Id: Ief0b9202e13bd70cf0de84ca3cb20f5c6df4d3d8
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4035
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/include/utility')
| -rw-r--r-- | src/include/utility | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/include/utility b/src/include/utility index 3e6fbc413..5a36e117c 100644 --- a/src/include/utility +++ b/src/include/utility @@ -53,7 +53,7 @@ namespace std * @return a newly-constructed pair<> object */ template <typename T1, typename T2> __attribute__ ((always_inline)) - pair<T1,T2> make_pair (T1 x, T2 y) + inline pair<T1,T2> make_pair (T1 x, T2 y) { return ( pair<T1,T2>(x,y) ); } @@ -65,7 +65,7 @@ namespace std * @return true if x is strictly eq y */ template <typename T1, typename T2> __attribute__ ((always_inline)) - bool operator==(const pair<T1, T2>& x, const pair<T1, T2>& y) + inline bool operator==(const pair<T1, T2>& x, const pair<T1, T2>& y) { return x.first == y.first && x.second == y.second; } @@ -77,7 +77,7 @@ namespace std * @return true if x < y */ template<typename T1, typename T2> __attribute__ ((always_inline)) - bool operator<(const pair<T1, T2>& x, const pair<T1, T2>& y) + inline bool operator<(const pair<T1, T2>& x, const pair<T1, T2>& y) { return (x.first < y.first) || (!(y.first < x.first) && x.second < y.second); @@ -90,7 +90,7 @@ namespace std * @return true if x != y */ template<typename T1, typename T2> __attribute__ ((always_inline)) - bool operator!=(const pair<T1, T2>& x, const pair<T1, T2>& y) + inline bool operator!=(const pair<T1, T2>& x, const pair<T1, T2>& y) { return !(x == y); } @@ -103,7 +103,7 @@ namespace std * @return true if x > y */ template<typename T1, typename T2> __attribute__ ((always_inline)) - bool operator>(const pair<T1, T2>& x, const pair<T1, T2>& y) + inline bool operator>(const pair<T1, T2>& x, const pair<T1, T2>& y) { return y < x; } @@ -115,7 +115,7 @@ namespace std * @return true if x <= y */ template<typename T1, typename T2> __attribute__ ((always_inline)) - bool operator<=(const pair<T1, T2>& x, const pair<T1, T2>& y) + inline bool operator<=(const pair<T1, T2>& x, const pair<T1, T2>& y) { return !(y < x); } @@ -127,7 +127,7 @@ namespace std * @return true if x >= y */ template<typename T1, typename T2> __attribute__ ((always_inline)) - bool operator>=(const pair<T1, T2>& x, const pair<T1, T2>& y) + inline bool operator>=(const pair<T1, T2>& x, const pair<T1, T2>& y) { return !(x < y); } |
