diff options
| -rw-r--r-- | drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 3 | ||||
| -rw-r--r-- | include/comphelper/random.hxx | 2 | ||||
| -rw-r--r-- | scaddins/source/analysis/analysis.cxx | 3 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 3 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 3 |
5 files changed, 5 insertions, 9 deletions
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 4a2944be5bb0..a4f667e18e4e 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <basegfx/polygon/b2dlinegeometry.hxx> -#include <boost/math/special_functions/next.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <comphelper/random.hxx> @@ -218,7 +217,7 @@ namespace drawinglayer { double getRandomColorRange() { - return comphelper::rng::uniform_real_distribution(0.0, boost::math::nextafter(1.0, DBL_MAX)); + return comphelper::rng::uniform_real_distribution(0.0, std::nextafter(1.0, DBL_MAX)); } } diff --git a/include/comphelper/random.hxx b/include/comphelper/random.hxx index 3b1fabb3f7aa..ca0d3dd2430b 100644 --- a/include/comphelper/random.hxx +++ b/include/comphelper/random.hxx @@ -23,7 +23,7 @@ namespace rng COMPHELPER_DLLPUBLIC void reseed(int i); // note that uniform_int_distribution is inclusive of b, i.e. [a,b] while -// uniform_real_distribution is exclusive of b, i.e. [a,b), [std/boost]::nextafter may be your friend there +// uniform_real_distribution is exclusive of b, i.e. [a,b), std::nextafter may be your friend there /// uniform distribution in [a,b) COMPHELPER_DLLPUBLIC double uniform_real_distribution(double a = 0.0, double b = 1.0); diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 00ed821dfee1..28ccc2d91d12 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -31,7 +31,6 @@ #include <string.h> #include <tools/resmgr.hxx> #include <tools/rcid.h> -#include <boost/math/special_functions/next.hpp> #define ADDIN_SERVICE "com.sun.star.sheet.AddIn" #define MY_SERVICE "com.sun.star.sheet.addin.Analysis" @@ -702,7 +701,7 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) throw( if( fMin > fMax ) throw lang::IllegalArgumentException(); - double fRet = floor(comphelper::rng::uniform_real_distribution(fMin, boost::math::nextafter(fMax+1, -DBL_MAX))); + double fRet = floor(comphelper::rng::uniform_real_distribution(fMin, std::nextafter(fMax+1, -DBL_MAX))); RETURN_FINITE( fRet ); } diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index ce78ab0c40ec..736c8c750c61 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -32,7 +32,6 @@ #include <utility> #include <boost/make_shared.hpp> -#include <boost/math/special_functions/next.hpp> #include <comphelper/random.hxx> #include "OGLTrans_TransitionImpl.hxx" @@ -676,7 +675,7 @@ boost::shared_ptr<OGLTransitionImpl> makeRochade() inline double randFromNeg1to1() { - return comphelper::rng::uniform_real_distribution(-1.0, boost::math::nextafter(1.0, DBL_MAX)); + return comphelper::rng::uniform_real_distribution(-1.0, std::nextafter(1.0, DBL_MAX)); } // TODO(Q3): extract to basegfx diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index a9d36341b6af..b42ef149ce7a 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -32,7 +32,6 @@ #include <vcl/bmpacc.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <boost/math/special_functions/next.hpp> #include <vcldemo-debug.hxx> #include <rtl/math.hxx> @@ -318,7 +317,7 @@ public: for (int i = 0; i < PRINT_N_TEXT; i++) { rDev.SetTextColor(Color(nCols[i % SAL_N_ELEMENTS(nCols)])); // random font size to avoid buffering - vcl::Font aFont(maFontNames[i % maFontNames.size()], Size(0, 1 + i * (0.9 + comphelper::rng::uniform_real_distribution(0.0, boost::math::nextafter(0.1, DBL_MAX))) * (r.Top() - r.Bottom())/PRINT_N_TEXT)); + vcl::Font aFont(maFontNames[i % maFontNames.size()], Size(0, 1 + i * (0.9 + comphelper::rng::uniform_real_distribution(0.0, std::nextafter(0.1, DBL_MAX))) * (r.Top() - r.Bottom())/PRINT_N_TEXT)); rDev.SetFont(aFont); rDev.DrawText(r, aText.copy(0, 4 + (aText.getLength() - 4) * (PRINT_N_TEXT - i)/PRINT_N_TEXT)); } |