AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix VC++ ptr-to-... and va_list confusion

Browse Source 
R=bungeman@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/78903006

git-svn-id: http://skia.googlecode.com/svn/trunk@12346 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-11-21 17:20:17 +00:00
parent e898e9c65e
commit ce0e4efabd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkString.h
View File

@ -196,7 +196,7 @@ public:
void printf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
void appendf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
void appendf(const char format[], va_list);
void appendVAList(const char format[], va_list);
void prependf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
void remove(size_t offset, size_t length);

2
src/core/SkString.cpp
View File

@ -569,7 +569,7 @@ void SkString::appendf(const char format[], ...) {
this->append(buffer, strlen(buffer));
}
void SkString::appendf(const char format[], va_list args) {
void SkString::appendVAList(const char format[], va_list args) {
char buffer[kBufferSize];
VSNPRINTF(buffer, kBufferSize, format, args);

4
src/gpu/gl/GrGLShaderBuilder.h
View File

@ -66,7 +66,7 @@ public:
void fsCodeAppendf(const char format[], ...) SK_PRINTF_LIKE(2, 3) {
va_list args;
va_start(args, format);
fFSCode.appendf(format, args);
fFSCode.appendVAList(format, args);
va_end(args);
}
@ -356,7 +356,7 @@ public:
void vsCodeAppendf(const char format[], ...) SK_PRINTF_LIKE(2, 3) {
va_list args;
va_start(args, format);
fVSCode.appendf(format, args);
fVSCode.appendVAList(format, args);
va_end(args);
}