diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-16 14:27:58 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-16 14:27:58 +0000 |
| commit | 3d60e28ce573bfd28286d108eeb43ec29bf44d48 (patch) | |
| tree | 809f1a8ef1739badd72137422324bfd9bdaeec06 /plugins/SmileyAdd | |
| parent | 376a1a5f4c37183a64aa83b0225ce9bb20c8605b (diff) | |
removed not needed _MSC_VER checks
removed double comstant from modern
warning fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@6087 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SmileyAdd')
| -rw-r--r-- | plugins/SmileyAdd/src/bkstring.h | 4 | ||||
| -rw-r--r-- | plugins/SmileyAdd/src/general.cpp | 10 |
2 files changed, 0 insertions, 14 deletions
diff --git a/plugins/SmileyAdd/src/bkstring.h b/plugins/SmileyAdd/src/bkstring.h index 3a43c2bece..f5752cb280 100644 --- a/plugins/SmileyAdd/src/bkstring.h +++ b/plugins/SmileyAdd/src/bkstring.h @@ -25,11 +25,7 @@ public: typedef value_type* iterator;
typedef const value_type* const_iterator;
-#if defined(_MSC_VER) && (_MSC_VER <= 1200)
- enum { npos = -1 };
-#else
static const size_type npos = size_type(-1);
-#endif
private:
value_type* buf;
diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp index ad11e50420..18cc673032 100644 --- a/plugins/SmileyAdd/src/general.cpp +++ b/plugins/SmileyAdd/src/general.cpp @@ -211,22 +211,18 @@ bool InitGdiPlus(void) static const TCHAR errmsg[] = _T("GDI+ not installed.\n")
_T("GDI+ can be downloaded here: http://www.microsoft.com/downloads");
-#ifdef _MSC_VER
__try
-#endif
{
if (g_gdiplusToken == 0 && !gdiPlusFail)
{
Gdiplus::GdiplusStartup(&g_gdiplusToken, &gdiplusStartupInput, NULL);
}
}
-#ifdef _MSC_VER
__except ( EXCEPTION_EXECUTE_HANDLER )
{
gdiPlusFail = true;
ReportError(errmsg);
}
-#endif
return !gdiPlusFail;
}
@@ -236,13 +232,7 @@ void DestroyGdiPlus(void) if (g_gdiplusToken != 0)
{
Gdiplus::GdiplusShutdown(g_gdiplusToken);
-#ifdef _MSC_VER
-#if 1200 < _MSC_VER
__FUnloadDelayLoadedDLL2("gdiplus.dll");
-#else
- __FUnloadDelayLoadedDLL("gdiplus.dll");
-#endif
-#endif
g_gdiplusToken = 0;
}
}
|