Kaydet (Commit) 904959b8 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove OStorePageData typedef

Change-Id: I9f4e8fa41a59325fe7036acb66d045a833294bd6
üst ba09cda3
......@@ -331,7 +331,6 @@ struct OStorePageLink
* PageData.
*
*======================================================================*/
typedef struct PageData OStorePageData; // backward compat.
struct PageData
{
typedef OStorePageGuard G;
......@@ -678,7 +677,7 @@ class OStorePageBIOS;
class OStorePageObject
{
typedef OStorePageData page;
typedef PageData page;
public:
/** Allocation.
......
......@@ -403,7 +403,7 @@ storeError PageCache::removePageAt (sal_uInt32 nOffset)
* Old OStorePageCache implementation.
*
* (two-way association (sorted address array, LRU chain)).
* (external OStorePageData representation).
* (external PageData representation).
*
*/
......
......@@ -39,9 +39,9 @@ namespace store
*======================================================================*/
#define STORE_MAGIC_DATAPAGE sal_uInt32(0x94190310)
struct OStoreDataPageData : public store::OStorePageData
struct OStoreDataPageData : public store::PageData
{
typedef OStorePageData base;
typedef PageData base;
typedef OStoreDataPageData self;
typedef OStorePageDescriptor D;
......@@ -123,9 +123,9 @@ public:
*======================================================================*/
#define STORE_MAGIC_INDIRECTPAGE sal_uInt32(0x89191107)
struct OStoreIndirectionPageData : public store::OStorePageData
struct OStoreIndirectionPageData : public store::PageData
{
typedef OStorePageData base;
typedef PageData base;
typedef OStoreIndirectionPageData self;
typedef OStorePageGuard G;
......@@ -519,9 +519,9 @@ struct OStoreDirectoryDataBlock
*======================================================================*/
#define STORE_MAGIC_DIRECTORYPAGE sal_uInt32(0x62190120)
struct OStoreDirectoryPageData : public store::OStorePageData
struct OStoreDirectoryPageData : public store::PageData
{
typedef OStorePageData base;
typedef PageData base;
typedef OStoreDirectoryPageData self;
typedef OStorePageDescriptor D;
......
......@@ -39,7 +39,7 @@ using namespace store;
* OStoreBTreeNodeData.
*/
OStoreBTreeNodeData::OStoreBTreeNodeData (sal_uInt16 nPageSize)
: OStorePageData (nPageSize)
: PageData (nPageSize)
{
base::m_aGuard.m_nMagic = store::htonl(self::theTypeId);
base::m_aDescr.m_nUsed = store::htons(self::thePageSize); // usageCount(0)
......
......@@ -100,9 +100,9 @@ struct OStoreBTreeEntry
*======================================================================*/
#define STORE_MAGIC_BTREENODE sal_uInt32(0x58190322)
struct OStoreBTreeNodeData : public store::OStorePageData
struct OStoreBTreeNodeData : public store::PageData
{
typedef OStorePageData base;
typedef PageData base;
typedef OStoreBTreeNodeData self;
typedef OStorePageGuard G;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment