diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:34:29 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:34:29 +0000 |
| commit | 3247e1acba725a45e8b970ca9af74efeee355906 (patch) | |
| tree | d6f26b2fda0c89e38cd78804b1dd636ac0f45c91 /store/source | |
| parent | cf9941ab500256c20f334c0a8d59d41c3a156042 (diff) | |
INTEGRATION: CWS warnings01 (1.3.120); FILE MERGED
2006/04/07 20:02:26 sb 1.3.120.5: RESYNC: (1.4-1.5); FILE MERGED
2005/11/07 12:11:49 sb 1.3.120.4: #i53898# Made code warning-free (additional -W switches for GCC).
2005/09/22 21:59:14 sb 1.3.120.3: RESYNC: (1.3-1.4); FILE MERGED
2005/09/02 16:34:17 sb 1.3.120.2: #i53898# Made code warning-free.
2005/09/02 16:30:33 sb 1.3.120.1: #i53898# Made code warning-free.
Diffstat (limited to 'store/source')
| -rw-r--r-- | store/source/stortree.cxx | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx index 42e8b25c08b1..08d30867dadb 100644 --- a/store/source/stortree.cxx +++ b/store/source/stortree.cxx @@ -4,9 +4,9 @@ * * $RCSfile: stortree.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2006-02-28 10:32:53 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:34:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,7 @@ * ************************************************************************/ -#define _STORE_STORTREE_CXX "$Revision: 1.5 $" +#define _STORE_STORTREE_CXX "$Revision: 1.6 $" #ifndef _SAL_TYPES_H_ #include <sal/types.h> @@ -99,7 +99,12 @@ void OStoreBTreeNodeData::initialize (void) /* * swap. */ -void OStoreBTreeNodeData::swap (const D& rDescr) +void OStoreBTreeNodeData::swap ( + const D& +#ifdef OSL_BIGENDIAN + rDescr +#endif /* OSL_BIGENDIAN */ +) { #ifdef OSL_BIGENDIAN m_aGuard.swap(); @@ -218,7 +223,12 @@ void OStoreBTreeNodeData::truncate (sal_uInt16 n) /* * swap. */ -void OStoreBTreeNodeObject::swap (const D& rDescr) +void OStoreBTreeNodeObject::swap ( + const D& +#ifdef OSL_BIGENDIAN + rDescr +#endif /* OSL_BIGENDIAN */ +) { #ifdef OSL_BIGENDIAN base::swap (rDescr); @@ -498,8 +508,7 @@ storeError OStoreBTreeRootObject::change ( STORE_METHOD_ENTER(pMutex); // Save PageDescriptor. - typedef OStorePageDescriptor D; - D aDescr (m_rPage.m_aDescr); + OStorePageDescriptor aDescr (m_rPage.m_aDescr); // Acquire Lock. storeError eErrCode = rBIOS.acquireLock (aDescr.m_nAddr, aDescr.m_nSize); @@ -549,7 +558,7 @@ storeError OStoreBTreeRootObject::change ( * split. */ storeError OStoreBTreeRootObject::split ( - sal_uInt16 nIndexL, + sal_uInt16, OStoreBTreeNodeData &rPageL, OStoreBTreeNodeData &rPageR, OStorePageBIOS &rBIOS, |