diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-13 14:33:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-21 09:14:45 +0200 |
| commit | 841e1a6f3619054ecc9240e061cd83d4e41d1ca9 (patch) | |
| tree | 2ee3989b2d3291c9b276205492d43369827ca3cf /connectivity | |
| parent | 4354f0e9ef4a5538729a2a6f2d1745e247f6c5cd (diff) | |
remove some old MSVC workarounds
Change-Id: I6abd8aaffb27b3c85df7c0518f7f576be4e32222
Reviewed-on: https://gerrit.libreoffice.org/36660
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/dbase/dindexnode.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/inc/dbase/dindexnode.hxx | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 0130de2905d0..81451234052d 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -66,7 +66,7 @@ ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec) // index page ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent) : nRefCount(0) - , bNoDelete(1) + , bNoDelete(true) , nPagePos(nPos) , bModified(false) , nCount(0) @@ -110,7 +110,7 @@ void ONDXPage::QueryDelete() ppNodes[i] = ONDXNode(); } - bNoDelete = 1; + bNoDelete = true; nCount = 0; aParent.Clear(); diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 00c359cbfad6..d1a7c24e3255 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -120,8 +120,7 @@ namespace connectivity // work around a clang 3.5 optimization bug: if the bNoDelete is *first* // it mis-compiles "if (--nRefCount == 0)" and never deletes any object unsigned int nRefCount : 31; - // the only reason this is not bool is because MSVC cannot handle mixed type bitfields - unsigned int bNoDelete : 1; + bool bNoDelete : 1; sal_uInt32 nPagePos; // Position in the index file bool bModified : 1; sal_uInt16 nCount; @@ -190,7 +189,7 @@ namespace connectivity { assert( nRefCount < (1 << 30) && "Do not add refs to dead objects" ); if( bNoDelete ) - bNoDelete = 0; + bNoDelete = false; ++nRefCount; } |