Skip to content

Commit e5832c1

Browse files
setoutsoftsetoutsoft
committed
fix template compile error.
1 parent 7566c3c commit e5832c1

File tree

4 files changed

+29
-26
lines changed

4 files changed

+29
-26
lines changed

‎SOUI/include/SApp.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@ interface IMsgLoopFactory : public IObjRef
6262

6363
interface SOUI_EXP ISystemObjectRegister
6464
{
65-
virtual void RegisterLayouts(SObjectFactoryMgr *objFactory) {}
66-
virtual void RegisterSkins(SObjectFactoryMgr *objFactory) {}
67-
virtual void RegisterWindows(SObjectFactoryMgr *objFactory) {}
68-
virtual void RegisterInterpolator(SObjectFactoryMgr *objFactory) {}
65+
virtual void RegisterLayouts(SObjectFactoryMgr *objFactory) const {}
66+
virtual void RegisterSkins(SObjectFactoryMgr *objFactory) const {}
67+
virtual void RegisterWindows(SObjectFactoryMgr *objFactory) const {}
68+
virtual void RegisterInterpolator(SObjectFactoryMgr *objFactory) const {}
6969
};
7070

7171
class SOUI_EXP SObjectDefaultRegister : public ISystemObjectRegister
7272
{
7373
public:
74-
void RegisterWindows(SObjectFactoryMgr *objFactory);
75-
void RegisterSkins(SObjectFactoryMgr *objFactory);
76-
void RegisterLayouts(SObjectFactoryMgr *objFactory);
77-
void RegisterInterpolator(SObjectFactoryMgr *objFactory);
74+
void RegisterWindows(SObjectFactoryMgr *objFactory) const;
75+
void RegisterSkins(SObjectFactoryMgr *objFactory) const;
76+
void RegisterLayouts(SObjectFactoryMgr *objFactory) const;
77+
void RegisterInterpolator(SObjectFactoryMgr *objFactory) const;
7878
};
7979

8080

@@ -99,7 +99,7 @@ class SOUI_EXP SApplication :public SSingleton<SApplication>
9999
*
100100
* Describe
101101
*/
102-
SApplication(IRenderFactory *pRendFactory,HINSTANCE hInst,LPCTSTR pszHostClassName = _T("SOUIHOST"), ISystemObjectRegister & sysObjRegister = SObjectDefaultRegister(), BOOL bImeApp = FALSE);
102+
SApplication(IRenderFactory *pRendFactory,HINSTANCE hInst,LPCTSTR pszHostClassName = _T("SOUIHOST"), const ISystemObjectRegister & sysObjRegister = SObjectDefaultRegister(), BOOL bImeApp = FALSE);
103103

104104
~SApplication(void);
105105

‎SOUI/src/SApp.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class SDefMsgLoopFactory : public TObjRefImpl<IMsgLoopFactory>
9393
}
9494
};
9595

96-
void SObjectDefaultRegister::RegisterWindows(SObjectFactoryMgr *objFactory)
96+
void SObjectDefaultRegister::RegisterWindows(SObjectFactoryMgr *objFactory) const
9797
{
9898
objFactory->TplRegisterFactory<SWindow>();
9999
objFactory->TplRegisterFactory<SPanel>();
@@ -143,7 +143,7 @@ void SObjectDefaultRegister::RegisterWindows(SObjectFactoryMgr *objFactory)
143143
objFactory->TplRegisterFactory<SDateTimePicker>();
144144
}
145145

146-
void SObjectDefaultRegister::RegisterSkins(SObjectFactoryMgr *objFactory)
146+
void SObjectDefaultRegister::RegisterSkins(SObjectFactoryMgr *objFactory) const
147147
{
148148
objFactory->TplRegisterFactory<SSkinImgList>();
149149
objFactory->TplRegisterFactory<SSkinImgCenter>();
@@ -157,7 +157,7 @@ void SObjectDefaultRegister::RegisterSkins(SObjectFactoryMgr *objFactory)
157157
objFactory->TplRegisterFactory<SSKinGroup>();
158158
}
159159

160-
void SObjectDefaultRegister::RegisterLayouts(SObjectFactoryMgr *objFactory)
160+
void SObjectDefaultRegister::RegisterLayouts(SObjectFactoryMgr *objFactory) const
161161
{
162162
objFactory->TplRegisterFactory<SouiLayout>();
163163
objFactory->TplRegisterFactory<SLinearLayout>();
@@ -166,7 +166,7 @@ void SObjectDefaultRegister::RegisterLayouts(SObjectFactoryMgr *objFactory)
166166
objFactory->TplRegisterFactory<SGridLayout>();
167167
}
168168

169-
void SObjectDefaultRegister::RegisterInterpolator(SObjectFactoryMgr *objFactory)
169+
void SObjectDefaultRegister::RegisterInterpolator(SObjectFactoryMgr *objFactory) const
170170
{
171171
objFactory->TplRegisterFactory<SLinearInterpolator>();
172172
objFactory->TplRegisterFactory<SAccelerateInterpolator>();
@@ -183,7 +183,7 @@ void SObjectDefaultRegister::RegisterInterpolator(SObjectFactoryMgr *objFactory)
183183

184184
template<> SApplication* SSingleton<SApplication>::ms_Singleton = 0;
185185

186-
SApplication::SApplication(IRenderFactory *pRendFactory,HINSTANCE hInst,LPCTSTR pszHostClassName, ISystemObjectRegister & sysObjRegister,BOOL bImeApp)
186+
SApplication::SApplication(IRenderFactory *pRendFactory,HINSTANCE hInst,LPCTSTR pszHostClassName, const ISystemObjectRegister & sysObjRegister,BOOL bImeApp)
187187
:m_hInst(hInst)
188188
,m_RenderFactory(pRendFactory)
189189
,m_hMainWnd(NULL)

‎utilities/include/atl.mini/SComCli.h

+8-5
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,14 @@ class SComPtrBase
158158
if (p == NULL || pOther == NULL)
159159
return false; // One is NULL the other is not
160160

161-
SComPtr<IUnknown> punk1;
162-
SComPtr<IUnknown> punk2;
161+
IUnknown* punk1;
162+
IUnknown* punk2;
163163
p->QueryInterface(__uuidof(IUnknown), (void**)&punk1);
164164
pOther->QueryInterface(__uuidof(IUnknown), (void**)&punk2);
165-
return punk1 == punk2;
165+
bool bEqual = punk1 == punk2;
166+
punk1->Release();
167+
punk2->Release();
168+
return bEqual;
166169
}
167170
// Attach to an existing interface (does not AddRef)
168171
void Attach( T* p2) throw()
@@ -244,15 +247,15 @@ class SComPtr : public SComPtrBase<T>
244247
{
245248
if( !IsEqualObject(lp) )
246249
{
247-
return static_cast<T*>(SComQIPtrAssign((IUnknown**)&p, lp, __uuidof(T)));
250+
return static_cast<T*>(SComQIPtrAssign((IUnknown**)&this->p, lp, __uuidof(T)));
248251
}
249252
return *this;
250253
}
251254
T* operator=( const SComPtr<T>& lp) throw()
252255
{
253256
if(*this!=lp)
254257
{
255-
return static_cast<T*>(SComPtrAssign((IUnknown**)&p, lp));
258+
return static_cast<T*>(SComPtrAssign((IUnknown**)&this->p, lp));
256259
}
257260
return *this;
258261
}

‎utilities/include/souicoll.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -3855,7 +3855,7 @@ typename SRBMap< K, V, KTraits, VTraits >::CPair* SRBMap< K, V, KTraits, VTraits
38553855
template< typename K, typename V, class KTraits, class VTraits >
38563856
bool SRBMap< K, V, KTraits, VTraits >::Lookup( typename SRBTree< K, V, KTraits, VTraits >::KINARGTYPE key, typename SRBTree< K, V, KTraits, VTraits >::VOUTARGTYPE value ) const
38573857
{
3858-
const CPair* pLookup = Find( key );
3858+
const SRBTree::CPair* pLookup = Find( key );
38593859
if( pLookup == NULL )
38603860
return false;
38613861

@@ -3941,8 +3941,8 @@ template< typename K, typename V, class KTraits, class VTraits >
39413941
const typename SRBMultiMap< K, V, KTraits, VTraits >::CPair* SRBMultiMap< K, V, KTraits, VTraits >::GetNextWithKey( typename SRBMultiMap< K, V, KTraits, VTraits >::SPOSITION& pos, typename SRBTree< K, V, KTraits, VTraits >::KINARGTYPE key ) const
39423942
{
39433943
SASSERT( pos != NULL );
3944-
const CPair* pNode = GetNext( pos );
3945-
if( (pos == NULL) || !KTraits::CompareElements( static_cast< CPair* >( pos )->m_key, key ) )
3944+
const SRBTree::CPair* pNode = GetNext( pos );
3945+
if( (pos == NULL) || !KTraits::CompareElements( static_cast<SRBTree::CPair* >( pos )->m_key, key ) )
39463946
{
39473947
pos = NULL;
39483948
}
@@ -3954,8 +3954,8 @@ template< typename K, typename V, class KTraits, class VTraits >
39543954
typename SRBMultiMap< K, V, KTraits, VTraits >::CPair* SRBMultiMap< K, V, KTraits, VTraits >::GetNextWithKey(typename SRBMultiMap< K, V, KTraits, VTraits >::SPOSITION& pos, typename SRBTree< K, V, KTraits, VTraits >::KINARGTYPE key)
39553955
{
39563956
SASSERT( pos != NULL );
3957-
CPair* pNode = GetNext( pos );
3958-
if( (pos == NULL) || !KTraits::CompareElements( static_cast< CPair* >( pos )->m_key, key ) )
3957+
SRBTree::CPair* pNode = GetNext( pos );
3958+
if( (pos == NULL) || !KTraits::CompareElements( static_cast<SRBTree::CPair* >( pos )->m_key, key ) )
39593959
{
39603960
pos = NULL;
39613961
}
@@ -3966,15 +3966,15 @@ typename SRBMultiMap< K, V, KTraits, VTraits >::CPair* SRBMultiMap< K, V, KTrait
39663966
template< typename K, typename V, class KTraits, class VTraits >
39673967
const V& SRBMultiMap< K, V, KTraits, VTraits >::GetNextValueWithKey( typename SRBMultiMap< K, V, KTraits, VTraits >::SPOSITION& pos, typename SRBTree< K, V, KTraits, VTraits >::KINARGTYPE key ) const
39683968
{
3969-
const CPair* pPair = GetNextWithKey( pos, key );
3969+
const SRBTree::CPair* pPair = GetNextWithKey( pos, key );
39703970

39713971
return( pPair->m_value );
39723972
}
39733973

39743974
template< typename K, typename V, class KTraits, class VTraits >
39753975
V& SRBMultiMap< K, V, KTraits, VTraits >::GetNextValueWithKey( typename SRBMultiMap< K, V, KTraits, VTraits >::SPOSITION& pos, typename SRBTree< K, V, KTraits, VTraits >::KINARGTYPE key )
39763976
{
3977-
CPair* pPair = GetNextWithKey( pos, key );
3977+
SRBTree::CPair* pPair = GetNextWithKey( pos, key );
39783978

39793979
return( pPair->m_value );
39803980
}

0 commit comments

Comments
 (0)