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/util | |
| 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/util')
| -rw-r--r-- | src/include/util/functor.H | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/include/util/functor.H b/src/include/util/functor.H index 037f4ddd8..b5bf1f9de 100644 --- a/src/include/util/functor.H +++ b/src/include/util/functor.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/util/functor.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/util/functor.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __UTIL_FUNCTOR_H #define __UTIL_FUNCTOR_H @@ -75,7 +75,7 @@ namespace Util }; template <typename _ARG, typename _RESULT> - ALWAYS_INLINE + ALWAYS_INLINE inline ptr_to_unary_function<_ARG, _RESULT> ptr_fun(_RESULT (*f)(_ARG)) { return ptr_to_unary_function<_ARG,_RESULT>(f); @@ -97,7 +97,7 @@ namespace Util function_type function; public: - mem_ptr_to_unary_function(member_type& o, function_type f) + mem_ptr_to_unary_function(member_type& o, function_type f) : object(o), function(f) {}; _RESULT operator()(_ARG t) @@ -107,8 +107,8 @@ namespace Util }; template <typename _ARG, typename _RESULT, typename _CLASS> - ALWAYS_INLINE - mem_ptr_to_unary_function<_ARG, _RESULT, _CLASS> + ALWAYS_INLINE inline + mem_ptr_to_unary_function<_ARG, _RESULT, _CLASS> mem_ptr_fun(_CLASS& o, _RESULT (_CLASS::*f)(_ARG)) { return mem_ptr_to_unary_function<_ARG,_RESULT,_CLASS>(o, f); |
