Merge pull request #6914

114b581 Prevector type (Pieter Wuille)
2015-12-01 10:00:04 +01:00
parent 9490bd71bd 114b5812f6
commit 327291af02
19 changed files with 874 additions and 68 deletions
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -201,7 +201,7 @@ QList<std::pair<CScript,CAmount> > PaymentRequestPlus::getPayTo() const
        const unsigned char* scriptStr = (const unsigned char*)details.outputs(i).script().data();
        CScript s(scriptStr, scriptStr+details.outputs(i).script().size());

-        result.append(make_pair(s, details.outputs(i).amount()));
+        result.append(std::make_pair(s, details.outputs(i).amount()));
    }
    return result;
 }