feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Avoid warning when compilation with MSVC2013

Browse Source 
warning: C4005: 'va_copy' : macro redefinition

Change-Id: Ib2bfd2229cb3ae00e084dd6df7a4558a5a766d55
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Yuchen Deng
2013-11-10 21:59:08 +08:00
committed by Nikolai Kosjar
parent e2ab4ae1dd
commit ef1645f43f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/cplusplus/Parser.cpp vendored
View File

@@ -28,7 +28,7 @@
#include "QtContextKeywords.h" #include "QtContextKeywords.h"
#include <string> #include <string>
#include <cstdio> // for putchar #include <cstdio> // for putchar
#ifdef _MSC_VER #if defined(_MSC_VER) && (_MSC_VER < 1800)
# define va_copy(dst, src) ((dst) = (src)) # define va_copy(dst, src) ((dst) = (src))
#elif defined(__INTEL_COMPILER) && !defined(va_copy) #elif defined(__INTEL_COMPILER) && !defined(va_copy)
# define va_copy __va_copy # define va_copy __va_copy

2
src/libs/3rdparty/cplusplus/TranslationUnit.cpp vendored
View File

@@ -32,7 +32,7 @@
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
#ifdef _MSC_VER #if defined(_MSC_VER) && (_MSC_VER < 1800)
# define va_copy(dst, src) ((dst) = (src)) # define va_copy(dst, src) ((dst) = (src))
#elif defined(__INTEL_COMPILER) && !defined(va_copy) #elif defined(__INTEL_COMPILER) && !defined(va_copy)
# define va_copy __va_copy # define va_copy __va_copy