diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-05 20:54:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-05 22:21:49 +0000 |
| commit | 4d6a509efe6bd56613b5554556d3a4f7f4cfd0d5 (patch) | |
| tree | 22fc10679131c72993615d0fa634460d14a15ec8 /vcl | |
| parent | 076b098ddf80fc78773d3ed97b7fd50dbcb4ebb6 (diff) | |
convert all remaining BOOST_STATIC_ASSERT to static_assert
and we can include a few less headers
Change-Id: Id742849ff4c1c37a2b861aa3d6ab823f00ea87f8
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 2 | ||||
| -rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/filter/sgvtext.cxx | 7 |
3 files changed, 2 insertions, 8 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 49f4608d0969..c6dfd48303c7 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -22,8 +22,6 @@ #include <salgdi.hxx> #include <scrptrun.h> -#include <boost/static_assert.hpp> - #include <i18nlangtag/mslangid.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index a89183c68648..715615e73846 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -144,7 +144,6 @@ #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> -#include <boost/static_assert.hpp> #include <cassert> #include <cmath> #include <com/sun/star/accessibility/AccessibleEventObject.hpp> diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index e73dd09cf033..be5112315818 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -19,7 +19,6 @@ #include "sal/config.h" -#include <boost/static_assert.hpp> #include <osl/thread.h> #include <rtl/math.h> #include <comphelper/string.hxx> @@ -606,10 +605,8 @@ sal_uInt16 GetCharWidth(OutputDevice& rOut, UCHAR c) } else { - // with MaxChar == 255 c cannot be greater than MaxChar - // assert if MaxChar is ever changed - BOOST_STATIC_ASSERT( MaxChar == 255 ); - BOOST_STATIC_ASSERT(sizeof(UCHAR) == 1); + static_assert(MaxChar == 255, "with MaxChar == 255 c cannot be greater than MaxChar"); + static_assert(sizeof(UCHAR) == 1, "assert if MaxChar type is ever changed"); if (c>=MinChar /*&& c<=MaxChar*/) { ChrWidth=(sal_uInt16)rOut.GetTextWidth(OUString(reinterpret_cast<sal_Char*>(&c), 1, RTL_TEXTENCODING_IBM_437)); |