diff options
| author | Bill Hoffa <wghoffa@us.ibm.com> | 2015-02-20 08:57:35 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-02-20 12:30:09 -0600 |
| commit | db06e59745d76015d254d4202f132e1feb352f05 (patch) | |
| tree | 9e9009d1277c8e27e5a3695f2e8f3af50e4520a5 /src/include/util | |
| parent | 840f51601c3a261b838d4bc1f83f4fbb3379bff8 (diff) | |
| download | talos-hostboot-db06e59745d76015d254d4202f132e1feb352f05.tar.gz talos-hostboot-db06e59745d76015d254d4202f132e1feb352f05.zip | |
Ambiguous Sort Compiler Error fix with std::pair
Change-Id: Ic889378b96e6009a968f55ade2ad76e30cc02f72
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15861
Tested-by: Jenkins Server
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/include/util')
| -rw-r--r-- | src/include/util/impl/qsort.H | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/include/util/impl/qsort.H b/src/include/util/impl/qsort.H index 874bbee64..718e3f643 100644 --- a/src/include/util/impl/qsort.H +++ b/src/include/util/impl/qsort.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -106,10 +108,10 @@ namespace Util std::swap(*pivot,*division); } - // Sort each partition. - sort(first,division); + // Sort each partition + __Util_QSort_Impl::sort(first,division); std::advance(division, 1); - sort(division, last); + __Util_QSort_Impl::sort(division, last); }; @@ -178,9 +180,9 @@ namespace Util } // Sort each partition. - sort(first,division,pred); + __Util_QSort_Impl::sort(first,division,pred); std::advance(division, 1); - sort(division, last,pred); + __Util_QSort_Impl::sort(division, last,pred); }; }; |
