QPR-11939 -- Cleanup

Author: NathanielVolfango

QuantExt/qle/cashflows/cpicoupon.cpp

@@ -383,26 +383,23 @@ CPILeg::operator Leg() const {
                 refEnd = schedule_.calendar().adjust(start + schedule_.tenor(), bdc);
             }
 
-            ext::shared_ptr<CPICoupon> coup;
-
-            coup = ext::make_shared<CPICoupon>(
+            auto coup = ext::make_shared<CPICoupon>(
                 baseCPI_, // all have same base for ratio
-                baseDate,
-                paymentDate, detail::get(notionals_, i, 0.0), start, end, index_,
-                observationLag_, observationInterpolation_, paymentDayCounter_, detail::get(fixedRates_, i, 0.0),
+                baseDate, paymentDate, detail::get(notionals_, i, 0.0), start, end, index_, observationLag_,
+                observationInterpolation_, paymentDayCounter_, detail::get(fixedRates_, i, 0.0),
                 detail::get(spreads_, i, 0.0), refStart, refEnd, exCouponDate, subtractInflationNominalAllCoupons_);
 
             // set a pricer for the underlying coupon straight away because it only provides computation - not data
-            ext::shared_ptr<CPICouponPricer> pricer(new CPICouponPricer(Handle<YieldTermStructure>(rateCurve_)));
+            auto pricer = ext::make_shared<CPICouponPricer>(Handle<YieldTermStructure>(rateCurve_));
             coup->setPricer(pricer);
 
             if (detail::noOption(caps_, floors_, i)) { // just swaplet
-                leg.push_back(ext::dynamic_pointer_cast<CashFlow>(coup));
+                leg.push_back(coup);
             } else { // cap/floorlet
-                ext::shared_ptr<CappedFlooredCPICoupon> cfCoup = ext::make_shared<CappedFlooredCPICoupon>(
+                auto cfCoup = ext::make_shared<CappedFlooredCPICoupon>(
                     coup, startDate_, detail::get(caps_, i, Null<Rate>()), detail::get(floors_, i, Null<Rate>()));
                 // in this case we need to set the "outer" pricer later that handles cap and floor
-                leg.push_back(ext::dynamic_pointer_cast<CashFlow>(cfCoup));
+                leg.push_back(cfCoup);
             }
         }
     }