actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compile and link errors. The relevant parts of the standard have been cited for those following along at home.

Browse Source 
typename must be used for dependent name resolution as described in 14.6 [temp.res].
An elaborated-type-specifier with the class-key present is required ("shall be used") in a friend declaration for a class. 11.4.2 [class.friend] and 7.1.5.3.1 [decl.type.elab].
However, an elaborated-type-specifier cannot be  a typedef-name. 3.4.4.2 [basic.lookup.elab].
Lastly, the is no need for registration since "a definition for a static data member may be provided in a namespace scope enclosing the definition of the static member's class template." 14.5.1.3.1 [temp.static].
This commit is contained in:
Steve Checkoway
2007-08-14 09:17:56 +00:00
parent 3e3c1deea4
commit 62b49f2d7f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil_CachedObject.h
+8 -7
View File
@@ -44,7 +44,7 @@ public:
static void ClearCacheAll() static void ClearCacheAll()
{ {
CachedObjectHelpers::Lock(); CachedObjectHelpers::Lock();
FOREACH( ObjectPointer *, m_apObjectPointers, p ) for( typename vector<ObjectPointer *>::iterator p = m_apObjectPointers.begin(); p != m_apObjectPointers.end(); ++p )
{ {
(*p)->m_pCache = NULL; (*p)->m_pCache = NULL;
(*p)->m_bCacheIsSet = false; (*p)->m_bCacheIsSet = false;
@@ -56,7 +56,7 @@ public:
static void ClearCacheSpecific( const T *pObject ) static void ClearCacheSpecific( const T *pObject )
{ {
CachedObjectHelpers::Lock(); CachedObjectHelpers::Lock();
FOREACH( ObjectPointer *, m_apObjectPointers, p ) for( typename vector<ObjectPointer *>::iterator p = m_apObjectPointers.begin(); p != m_apObjectPointers.end(); ++p )
{ {
if( (*p)->m_pCache == pObject ) if( (*p)->m_pCache == pObject )
{ {
@@ -71,7 +71,7 @@ public:
static void ClearCacheNegative() static void ClearCacheNegative()
{ {
CachedObjectHelpers::Lock(); CachedObjectHelpers::Lock();
FOREACH( ObjectPointer *, m_apObjectPointers, p ) for( typename vector<ObjectPointer *>::iterator p = m_apObjectPointers.begin(); p != m_apObjectPointers.end(); ++p )
{ {
if( (*p)->m_pCache == NULL ) if( (*p)->m_pCache == NULL )
(*p)->m_bCacheIsSet = false; (*p)->m_bCacheIsSet = false;
@@ -81,7 +81,7 @@ public:
private: private:
typedef CachedObjectPointer<T> ObjectPointer; typedef CachedObjectPointer<T> ObjectPointer;
friend class ObjectPointer; friend class CachedObjectPointer<T>;
static void Register( ObjectPointer *p ) static void Register( ObjectPointer *p )
{ {
@@ -90,7 +90,7 @@ private:
static void Unregister( ObjectPointer *p ) static void Unregister( ObjectPointer *p )
{ {
vector<ObjectPointer *>::iterator it = find( m_apObjectPointers.begin(), m_apObjectPointers.end(), p ); typename vector<ObjectPointer *>::iterator it = find( m_apObjectPointers.begin(), m_apObjectPointers.end(), p );
ASSERT( it != m_apObjectPointers.end() ); ASSERT( it != m_apObjectPointers.end() );
m_apObjectPointers.erase( it ); m_apObjectPointers.erase( it );
} }
@@ -104,6 +104,7 @@ private:
const T *m_pObject; const T *m_pObject;
static vector<ObjectPointer *> m_apObjectPointers; static vector<ObjectPointer *> m_apObjectPointers;
}; };
template<typename T> vector<CachedObjectPointer<T> *> CachedObject<T>::m_apObjectPointers = vector<CachedObjectPointer<T> *>();
template<typename T> template<typename T>
class CachedObjectPointer class CachedObjectPointer
@@ -163,13 +164,13 @@ public:
} }
private: private:
friend class Object; friend class CachedObject<T>;
T *m_pCache; T *m_pCache;
bool m_bCacheIsSet; bool m_bCacheIsSet;
}; };
#define CACHED_REGISTER_CLASS(T) template<> vector<CachedObject<T>::ObjectPointer *> CachedObject<T>::m_apObjectPointers; #define CACHED_REGISTER_CLASS(T)
#endif #endif