Commit 6fa72fef authored by ddkilzer@apple.com's avatar ddkilzer@apple.com

BUILD FIX (r39641): Try to fix build errors #3

        Try to fix the following (more specific) build errors:

            WebIconDatabase.cpp
            ..\WebIconDatabase.cpp(255) : error C2248: 'WebIconDatabase::shutDownIconDatabase' : cannot access private member declared in class 'WebIconDatabase'
                    ...\webkit\win\WebIconDatabase.h(61) : see declaration of 'WebIconDatabase::shutDownIconDatabase'
                    ...\webkit\win\WebIconDatabase.h(51) : see declaration of 'WebIconDatabase'
            ..\WebIconDatabase.cpp(255) : error C2352: 'WebIconDatabase::shutDownIconDatabase' : illegal call of non-static member function
                    ...\webkit\win\WebIconDatabase.h(61) : see declaration of 'WebIconDatabase::shutDownIconDatabase'
            ..\WebIconDatabase.cpp(258) : error C2248: 'WebIconDatabase::startUpIconDatabase' : cannot access private member declared in class 'WebIconDatabase'
                    ...\webkit\win\WebIconDatabase.h(60) : see declaration of 'WebIconDatabase::startUpIconDatabase'
                    ...\webkit\win\WebIconDatabase.h(51) : see declaration of 'WebIconDatabase'
            ..\WebIconDatabase.cpp(258) : error C2352: 'WebIconDatabase::startUpIconDatabase' : illegal call of non-static member function
                    ...\webkit\win\WebIconDatabase.h(60) : see declaration of 'WebIconDatabase::startUpIconDatabase'

        * WebIconDatabase.cpp:
        (setEnabled): Get instance of shared WebIconDatabase, then call
        startUp/shutDown methods on it.
        * WebIconDatabase.h:
        (WebIconDatabase::startUpIconDatabase): Make protected again.
        (WebIconDatabase::shutDownIconDatabase): Ditto.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@39649 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6fb8c59f
2009-01-06 David Kilzer <ddkilzer@apple.com>
BUILD FIX (r39641): Try to fix build errors #3
Try to fix the following (more specific) build errors:
WebIconDatabase.cpp
..\WebIconDatabase.cpp(255) : error C2248: 'WebIconDatabase::shutDownIconDatabase' : cannot access private member declared in class 'WebIconDatabase'
...\webkit\win\WebIconDatabase.h(61) : see declaration of 'WebIconDatabase::shutDownIconDatabase'
...\webkit\win\WebIconDatabase.h(51) : see declaration of 'WebIconDatabase'
..\WebIconDatabase.cpp(255) : error C2352: 'WebIconDatabase::shutDownIconDatabase' : illegal call of non-static member function
...\webkit\win\WebIconDatabase.h(61) : see declaration of 'WebIconDatabase::shutDownIconDatabase'
..\WebIconDatabase.cpp(258) : error C2248: 'WebIconDatabase::startUpIconDatabase' : cannot access private member declared in class 'WebIconDatabase'
...\webkit\win\WebIconDatabase.h(60) : see declaration of 'WebIconDatabase::startUpIconDatabase'
...\webkit\win\WebIconDatabase.h(51) : see declaration of 'WebIconDatabase'
..\WebIconDatabase.cpp(258) : error C2352: 'WebIconDatabase::startUpIconDatabase' : illegal call of non-static member function
...\webkit\win\WebIconDatabase.h(60) : see declaration of 'WebIconDatabase::startUpIconDatabase'
* WebIconDatabase.cpp:
(setEnabled): Get instance of shared WebIconDatabase, then call
startUp/shutDown methods on it.
* WebIconDatabase.h:
(WebIconDatabase::startUpIconDatabase): Make protected again.
(WebIconDatabase::shutDownIconDatabase): Ditto.
2009-01-06 David Kilzer <ddkilzer@apple.com>
BUILD FIX (r39641): Try to fix build errors again
......
......@@ -252,10 +252,10 @@ HRESULT STDMETHODCALLTYPE setEnabled(
isEnabled(&currentlyEnabled);
if (currentlyEnabled && !flag) {
iconDatabase()->setEnabled(false);
WebIconDatabase::shutDownIconDatabase();
sharedWebIconDatabase()->shutDownIconDatabase();
} else if (!currentlyEnabled && flag) {
iconDatabase()->setEnabled(true);
WebIconDatabase::startUpIconDatabase();
sharedWebIconDatabase()->startUpIconDatabase();
}
return S_OK;
}
......
......@@ -57,6 +57,7 @@ private:
WebIconDatabase();
~WebIconDatabase();
void init();
protected:
void startUpIconDatabase();
void shutDownIconDatabase();
public:
......
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