diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/TemplateBase.cpp | 2 | ||||
| -rw-r--r-- | lib/Analysis/UninitializedValues.cpp | 2 | ||||
| -rw-r--r-- | lib/Lex/MacroArgs.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/AST/TemplateBase.cpp b/lib/AST/TemplateBase.cpp index b57f10b0c6..6114a5a051 100644 --- a/lib/AST/TemplateBase.cpp +++ b/lib/AST/TemplateBase.cpp @@ -338,7 +338,7 @@ void TemplateArgument::print(const PrintingPolicy &Policy, //===----------------------------------------------------------------------===// TemplateArgumentLocInfo::TemplateArgumentLocInfo() { - memset(this, 0, sizeof(TemplateArgumentLocInfo)); + memset((void*)this, 0, sizeof(TemplateArgumentLocInfo)); } SourceRange TemplateArgumentLoc::getSourceRange() const { diff --git a/lib/Analysis/UninitializedValues.cpp b/lib/Analysis/UninitializedValues.cpp index a1a49b6757..88a2db751a 100644 --- a/lib/Analysis/UninitializedValues.cpp +++ b/lib/Analysis/UninitializedValues.cpp @@ -173,7 +173,7 @@ CFGBlockValues::CFGBlockValues(const CFG &c) : cfg(c), vals(0) { if (!n) return; vals = new std::pair<ValueVector*, ValueVector*>[n]; - memset(vals, 0, sizeof(*vals) * n); + memset((void*)vals, 0, sizeof(*vals) * n); } CFGBlockValues::~CFGBlockValues() { diff --git a/lib/Lex/MacroArgs.cpp b/lib/Lex/MacroArgs.cpp index 89f6368a27..dee7da38aa 100644 --- a/lib/Lex/MacroArgs.cpp +++ b/lib/Lex/MacroArgs.cpp @@ -284,7 +284,7 @@ const Token &MacroArgs::getStringifiedArgument(unsigned ArgNo, assert(ArgNo < NumUnexpArgTokens && "Invalid argument number!"); if (StringifiedArgs.empty()) { StringifiedArgs.resize(getNumArguments()); - memset(&StringifiedArgs[0], 0, + memset((void*)&StringifiedArgs[0], 0, sizeof(StringifiedArgs[0])*getNumArguments()); } if (StringifiedArgs[ArgNo].isNot(tok::string_literal)) |