Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reneabled inlining, but kept warnings disabled....

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2003-12-14 04:23:35 +00:00
parent 57ba8fb858
commit 7b758e8f43
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/string.h
View File

@@ -216,8 +216,7 @@ struct WXDLLIMPEXP_BASE wxStringData
// VC++ will refuse to inline Unlock but profiling shows that it is wrong // VC++ will refuse to inline Unlock but profiling shows that it is wrong
#if defined(__VISUALC__) && (__VISUALC__ >= 1200) #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
// RN - VC6 Refuses to inline this anyway and spits out 2 warnings... __forceinline
// __forceinline
#endif #endif
// VC++ free must take place in same DLL as allocation when using non dll // VC++ free must take place in same DLL as allocation when using non dll
// run-time library (e.g. Multithreaded instead of Multithreaded DLL) // run-time library (e.g. Multithreaded instead of Multithreaded DLL)
@@ -332,8 +331,21 @@ public:
wxStringBase(const void *pStart, const void *pEnd); wxStringBase(const void *pStart, const void *pEnd);
// dtor is not virtual, this class must not be inherited from! // dtor is not virtual, this class must not be inherited from!
~wxStringBase() { GetStringData()->Unlock(); } ~wxStringBase()
{
#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
//RN - according to the above VC++ does indeed inline this,
//even though it spits out two warnings
#pragma warning (disable:4714)
#endif
GetStringData()->Unlock();
}
#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
//re-enable inlining warning
#pragma warning (default:4714)
#endif
// overloaded assignment // overloaded assignment
// from another wxString // from another wxString
wxStringBase& operator=(const wxStringBase& stringSrc); wxStringBase& operator=(const wxStringBase& stringSrc);