Fix VC++ ptr-to-... and va_list confusion
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
diff --git a/include/core/SkString.h b/include/core/SkString.h
index 5629cc0..291bd65 100644
--- a/include/core/SkString.h
+++ b/include/core/SkString.h
@@ -196,7 +196,7 @@
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);
diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp
index 7b3c265..e30b89f 100644
--- a/src/core/SkString.cpp
+++ b/src/core/SkString.cpp
@@ -569,7 +569,7 @@
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);
diff --git a/src/gpu/gl/GrGLShaderBuilder.h b/src/gpu/gl/GrGLShaderBuilder.h
index 1218554..52c24ae 100644
--- a/src/gpu/gl/GrGLShaderBuilder.h
+++ b/src/gpu/gl/GrGLShaderBuilder.h
@@ -66,7 +66,7 @@
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 @@
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);
}