Merge branch 'master' of gitlab.acadiasoft.net:qs/oreplus

Author: pcaspers

QuantExt/qle/termstructures/iterativebootstrap.hpp

@@ -49,8 +49,8 @@ QuantLib::Real dontThrowFallback(const QuantLib::BootstrapError<Curve>& error, Q
     QuantLib::Real stepSize = (xMax - xMin) / steps;
 
     for (QuantLib::Size i = 0; i <= steps; ++i) {
-        Real x = xMin + stepSize * static_cast<double>(i);
-        Real absError = QL_MAX_REAL;
+        QuantLib::Real x = xMin + stepSize * static_cast<double>(i);
+        QuantLib::Real absError = QL_MAX_REAL;
         try {
             absError = std::abs(error(x));
         } catch (...) {
@@ -176,7 +176,7 @@ template <class Curve> void IterativeBootstrap<Curve>::initialize() const {
         latestRelevantDate = helper->latestRelevantDate();
         // check that the helper is really extending the curve, i.e. that
         // pillar-sorted helpers are also sorted by latestRelevantDate
-        QL_REQUIRE(latestRelevantDate > maxDate, io::ordinal(j + 1)
+        QL_REQUIRE(latestRelevantDate > maxDate, QuantLib::io::ordinal(j + 1)
                                                      << " instrument (pillar: " << dates[i]
                                                      << ") has latestRelevantDate (" << latestRelevantDate
                                                      << ") before or equal to "
@@ -219,7 +219,7 @@ template <class Curve> void IterativeBootstrap<Curve>::calculate() const {
         const boost::shared_ptr<typename Traits::helper>& helper = ts_->instruments_[j];
 
         // check for valid quote
-        QL_REQUIRE(helper->quote()->isValid(), io::ordinal(j + 1)
+        QL_REQUIRE(helper->quote()->isValid(), QuantLib::io::ordinal(j + 1)
                                                    << " instrument (maturity: " << helper->maturityDate()
                                                    << ", pillar: " << helper->pillarDate() << ") has an invalid quote");