[Libreoffice-commits] core.git: store/source
Stephan Bergmann
sbergman at redhat.com
Thu Jun 20 01:54:48 PDT 2013
store/source/storcach.cxx | 4 ++--
store/source/stortree.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 104a7bab5806aad5dfc8afb5637ca4363e05443a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jun 20 10:54:20 2013 +0200
-Werror,-Wdeprecated-register
Change-Id: I1ec3d7845477cfb5bc6a3d7f70ddabef12583e1b
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index 481177e..e2ac68b6 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -222,7 +222,7 @@ void EntryCache::destroy (Entry * entry)
*======================================================================*/
static int highbit(sal_Size n)
{
- register int k = 1;
+ int k = 1;
if (n == 0)
return (0);
@@ -420,7 +420,7 @@ void PageCache_Impl::rescale_Impl (sal_Size new_size)
Entry * PageCache_Impl::lookup_Impl (Entry * entry, sal_uInt32 nOffset)
{
- register int lookups = 0;
+ int lookups = 0;
while (entry != 0)
{
if (entry->m_nOffset == nOffset)
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx
index 1499824..04bcd89 100644
--- a/store/source/stortree.cxx
+++ b/store/source/stortree.cxx
@@ -57,12 +57,12 @@ OStoreBTreeNodeData::OStoreBTreeNodeData (sal_uInt16 nPageSize)
*/
sal_uInt16 OStoreBTreeNodeData::find (const T& t) const
{
- register sal_Int32 l = 0;
- register sal_Int32 r = usageCount() - 1;
+ sal_Int32 l = 0;
+ sal_Int32 r = usageCount() - 1;
while (l < r)
{
- register sal_Int32 const m = ((l + r) >> 1);
+ sal_Int32 const m = ((l + r) >> 1);
if (t.m_aKey == m_pData[m].m_aKey)
return ((sal_uInt16)(m));
More information about the Libreoffice-commits
mailing list