diff options
| author | Zsolt Bölöny <bolony.zsolt@gmail.com> | 2015-05-19 17:36:54 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-02 13:20:02 +0000 |
| commit | d0f6f00c1af07e744b4302ed9f33ca6c025a1434 (patch) | |
| tree | 9e920b857f534818f6dcf138573ac97e2bd80333 /basegfx | |
| parent | d6e7dcb34322de4701c1cac4e87dc3b681c1dac4 (diff) | |
Replaced boost::tuple with std::tuple
Change-Id: Ia001c8e1e00df85d2be93e330811a1081179785d
Reviewed-on: https://gerrit.libreoffice.org/15816
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/source/range/b2dpolyrange.cxx | 4 | ||||
| -rw-r--r-- | basegfx/test/basegfx2d.cxx | 4 | ||||
| -rw-r--r-- | basegfx/test/boxclipper.cxx | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/basegfx/source/range/b2dpolyrange.cxx b/basegfx/source/range/b2dpolyrange.cxx index 3aec84dd6040..95982a63400b 100644 --- a/basegfx/source/range/b2dpolyrange.cxx +++ b/basegfx/source/range/b2dpolyrange.cxx @@ -25,7 +25,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <boost/bind.hpp> -#include <boost/tuple/tuple.hpp> #include <algorithm> #include <vector> @@ -52,8 +51,7 @@ namespace basegfx B2DPolyRange::ElementType getElement(sal_uInt32 nIndex) const { - return boost::make_tuple(maRanges[nIndex], - maOrient[nIndex]); + return std::make_tuple(maRanges[nIndex], maOrient[nIndex]); } void appendElement(const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount) diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index f6afc96aa3bf..8f06c6fafece 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -294,9 +294,9 @@ public: CPPUNIT_ASSERT_MESSAGE("simple poly range - count", aRange.count() == 2); CPPUNIT_ASSERT_MESSAGE("simple poly range - first element", - aRange.getElement(0).head == B2DRange(0,0,1,1)); + std::get<0>(aRange.getElement(0)) == B2DRange(0,0,1,1)); CPPUNIT_ASSERT_MESSAGE("simple poly range - second element", - aRange.getElement(1).head == B2DRange(2,2,3,3)); + std::get<0>(aRange.getElement(1)) == B2DRange(2,2,3,3)); // B2DPolyRange relies on correctly orientated rects const B2DRange aRect(0,0,1,1); diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index 696e86c622e9..c7ff41101b42 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -352,9 +352,8 @@ public: const sal_uInt32 nCount=rRange.count(); for( sal_uInt32 i=0; i<nCount; ++i ) { - B2DPolygon aRect=tools::createPolygonFromRect( - rRange.getElement(i).head); - if( rRange.getElement(i).tail.head == ORIENTATION_NEGATIVE ) + B2DPolygon aRect=tools::createPolygonFromRect(std::get<0>(rRange.getElement(i))); + if( std::get<1>(rRange.getElement(i)) == ORIENTATION_NEGATIVE ) aRect.flip(); genericClip.append(aRect); |