summaryrefslogtreecommitdiff
path: root/lib/d
diff options
context:
space:
mode:
authorJens Geyer <jensg@apache.org>2015-05-17 19:44:01 +0200
committerJens Geyer <jensg@apache.org>2015-05-17 19:44:01 +0200
commit83cd3e8d41001304f2efac9ebad92e02d3390ca7 (patch)
tree6ce436736128ab8536623693a28deded2768195f /lib/d
parente46ec45b38f2ba9062f9bcf1709708f8bdab1809 (diff)
downloadthrift-83cd3e8d41001304f2efac9ebad92e02d3390ca7.tar.gz
THRIFT-3162 Rename the 'format' parameter to disambiguate from std.format's format.
Client: D Patch: Phongphan Phuttha <phongphan@acm.org> This closes #502
Diffstat (limited to 'lib/d')
-rw-r--r--lib/d/src/thrift/base.d6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/d/src/thrift/base.d b/lib/d/src/thrift/base.d
index 5de13c53e..57aec1818 100644
--- a/lib/d/src/thrift/base.d
+++ b/lib/d/src/thrift/base.d
@@ -93,7 +93,7 @@ shared static this() {
// This should be private, if it could still be used through the aliases then.
template logFormatted(alias target) {
void logFormatted(string file = __FILE__, int line = __LINE__,
- T...)(string format, T args) if (
+ T...)(string fmt, T args) if (
__traits(compiles, { target(""); })
) {
import std.format, std.stdio;
@@ -107,9 +107,9 @@ template logFormatted(alias target) {
formattedWrite(g_formatBuffer, "%s:%s: ", file, line);
static if (T.length == 0) {
- g_formatBuffer.put(format);
+ g_formatBuffer.put(fmt);
} else {
- formattedWrite(g_formatBuffer, format, args);
+ formattedWrite(g_formatBuffer, fmt, args);
}
target(g_formatBuffer.data);
}