From c82efb610bf556ea12cbe4f94568ac619897799f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 13 Jan 2020 19:48:37 +0200 Subject: clang-tidy modernize-concat-nested-namespace Change-Id: Iab35a8b85b3ba1df791c774f40b037f9420a071a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86708 Tested-by: Jenkins Reviewed-by: Noel Grandin --- scaddins/source/analysis/analysishelper.cxx | 4 ++-- scaddins/source/analysis/bessel.cxx | 6 ++---- scaddins/source/pricing/black_scholes.cxx | 8 +------- 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'scaddins') diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 55520469728c..3206b650b30b 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -156,7 +156,7 @@ const FuncDataBase pFuncDatas[] = }; #undef FUNCDATA -namespace sca { namespace analysis { +namespace sca::analysis { sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear ) { @@ -2808,6 +2808,6 @@ sal_Int32 ScaAnyConverter::getInt32( return nResult; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/source/analysis/bessel.cxx b/scaddins/source/analysis/bessel.cxx index ab87ca0e10ce..bb6023a4f2f9 100644 --- a/scaddins/source/analysis/bessel.cxx +++ b/scaddins/source/analysis/bessel.cxx @@ -27,8 +27,7 @@ using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::sheet::NoConvergenceException; -namespace sca { -namespace analysis { +namespace sca::analysis { const double f_PI = 3.1415926535897932385; const double f_PI_DIV_2 = f_PI / 2.0; @@ -452,7 +451,6 @@ double BesselY( double fNum, sal_Int32 nOrder ) } } -} // namespace analysis -} // namespace sca +} // namespace sca::analysis /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/source/pricing/black_scholes.cxx b/scaddins/source/pricing/black_scholes.cxx index 126901ad5c20..57344d85cbec 100644 --- a/scaddins/source/pricing/black_scholes.cxx +++ b/scaddins/source/pricing/black_scholes.cxx @@ -78,10 +78,7 @@ // underruns, accuracy, etc -namespace sca { -namespace pricing { - -namespace bs { +namespace sca::pricing::bs { // helper functions @@ -937,9 +934,6 @@ double prob_in_money(double S, double vol, double mu, return val; } -} // namespace bs - -} // namespace pricing } // namespace sca -- cgit