diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-19 15:20:11 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-19 15:20:11 +0000 |
| commit | 28afefa9cf0af8c1e450bd47c0293e374e3b9230 (patch) | |
| tree | 30e1b65983f114604b1ea7eb51c7b5ead3c75b93 /idlc | |
| parent | 060faf5de50906d74f7a738915a37b91cc77a4b6 (diff) | |
INTEGRATION: CWS warningfixes02 (1.15.2); FILE MERGED
2006/07/03 06:42:33 sb 1.15.2.3: #i66723# ...and also disable MSC warning 4273 (bison problem?).
2006/06/30 08:09:06 sb 1.15.2.2: #i66723# Re-did previous fix: Instead of disabling C4273, removed the suspicious #ifdef WNT block that defined std::fprintf, std::malloc, std::free (which might have been needed long ago, but appears to not be needed today; the block was in there right from rev 1.1).
2006/06/29 12:55:58 sb 1.15.2.1: #i66723# For MSC, disable C4273: malloc/free inconsistent dll linkage, to avoid (spurious?) warnings depending on bison version used.
Diffstat (limited to 'idlc')
| -rw-r--r-- | idlc/source/parser.y | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 256d97dbeacb..96d52b078bb9 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -4,9 +4,9 @@ * * $RCSfile: parser.y,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2006-06-20 03:49:55 $ + * last change: $Author: kz $ $Date: 2006-07-19 16:20:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,33 +112,6 @@ #include <algorithm> #include <vector> -#ifdef WNT -#include <stdarg.h> -namespace std { -int fprintf(FILE* stream, const char* format, ...) -{ - va_list va_param; - - va_start(va_param, format); - int res = ::vfprintf(stream, format, va_param); - va_end(va_param); - - return res; -} - -void* malloc( size_t size ) -{ - return ::malloc(size); -} - -void free( void *memblock ) -{ - ::free(memblock); -} - -}; -#endif - using namespace ::rtl; #define YYDEBUG 1 @@ -294,7 +267,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) { #pragma disable_warn #elif defined _MSC_VER #pragma warning(push, 1) -#pragma warning(disable: 4701 4706) +#pragma warning(disable: 4273 4701 4706) #endif %} /* |