diff options
| author | Paweł Kołodziejski | 2005-05-09 22:39:16 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2005-05-09 22:39:16 +0000 |
| commit | c1ce66efb6fecc30f4f26b7eecaadbd91019dd90 (patch) | |
| tree | f6aaf6a87196d83b17d6552098419a7ec526c787 | |
| parent | 39cb499fcf7e1af3354e8ac77dac03d04a48ce79 (diff) | |
| download | scummvm-rg350-c1ce66efb6fecc30f4f26b7eecaadbd91019dd90.tar.gz scummvm-rg350-c1ce66efb6fecc30f4f26b7eecaadbd91019dd90.tar.bz2 scummvm-rg350-c1ce66efb6fecc30f4f26b7eecaadbd91019dd90.zip | |
fixed compilation for evc4 and vc7
svn-id: r18013
| -rw-r--r-- | common/list.h | 4 | ||||
| -rw-r--r-- | common/singleton.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/common/list.h b/common/list.h index 6e9cf83dab..b64e6304c4 100644 --- a/common/list.h +++ b/common/list.h @@ -33,6 +33,10 @@ namespace Common { template <class T> class List { protected: +#if defined (_WIN32_WCE) || (_MSC_VER) +//FIXME evc4 and msvc7 doesn't like it as protected member +public: +#endif struct NodeBase { NodeBase *_prev; NodeBase *_next; diff --git a/common/singleton.h b/common/singleton.h index 7d9f5e04d6..7e1290b4cd 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -45,8 +45,8 @@ private: * and you specialise makeInstance to return an instance of a subclass. */ //template <class T> -#ifdef _WIN32_WCE -//FIXME +#if defined (_WIN32_WCE) || (_MSC_VER) +//FIXME evc4 and msvc7 doesn't like it as private member public: #endif static T* makeInstance() { |