summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-12-11 13:22:58 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-12-11 13:22:58 +0000
commitd5479ea4dee1c8a6f298af873668f8dfe3c66766 (patch)
tree1c9ab106c7eaea7ade9e818e18ccf029e57450ad /include
parentfb119e1bdee2a9f53705144f7dcbc77f8525cfb4 (diff)
warning fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@11326 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
-rw-r--r--include/m_core.h2
-rw-r--r--include/m_extraicons.h2
-rw-r--r--include/m_system_cpp.h2
3 files changed, 6 insertions, 0 deletions
diff --git a/include/m_core.h b/include/m_core.h
index 407a00580b..59b613d726 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -71,6 +71,8 @@ typedef UINT32 MCONTACT;
#endif
#define DBVTF_VARIABLELENGTH 0x80
+#pragma warning(disable:4201)
+
typedef struct
{
BYTE type;
diff --git a/include/m_extraicons.h b/include/m_extraicons.h
index 3696372d8e..e2dbbd39be 100644
--- a/include/m_extraicons.h
+++ b/include/m_extraicons.h
@@ -145,6 +145,8 @@ typedef struct {
extern int hLangpack;
+#pragma warning(disable:4505)
+
static HANDLE ExtraIcon_Register(
const char *name, const char *description, const char *descIcon,
MIRANDAHOOK RebuildIcons,
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h
index c0b324f02b..2bb6d545a1 100644
--- a/include/m_system_cpp.h
+++ b/include/m_system_cpp.h
@@ -79,6 +79,7 @@ public:
class mir_cslock
{
CRITICAL_SECTION& cs;
+ __inline mir_cslock& operator = (const mir_cslock&) { return *this; }
public:
__inline mir_cslock(CRITICAL_SECTION& _cs) : cs(_cs) { ::EnterCriticalSection(&cs); }
@@ -92,6 +93,7 @@ class mir_cslockfull
{
CRITICAL_SECTION& cs;
bool bIsLocked;
+ __inline mir_cslockfull& operator = (const mir_cslockfull&) { return *this; }
public:
__inline void lock() { bIsLocked = true; EnterCriticalSection(&cs); }