From 5cbc6dfb5ba2bc6692a3789c1ea634d4fd1e2735 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Thu, 4 Jun 2009 11:56:47 +0200 Subject: [PATCH] use "str" as parameter, not "string" I wonder why compiler accepted that. --- src/helpers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers.cpp b/src/helpers.cpp index bfa4ed08..363a3e65 100644 --- a/src/helpers.cpp +++ b/src/helpers.cpp @@ -328,11 +328,11 @@ const Buffer &ShowTag(const string &tag) return result; } -const std::basic_string &Scroller(const string &string, size_t width, size_t &pos) +const std::basic_string &Scroller(const string &str, size_t width, size_t &pos) { static std::basic_string result; result.clear(); - std::basic_string s = TO_WSTRING(string); + std::basic_string s = TO_WSTRING(str); size_t len; # ifdef _UTF8 len = Window::Length(s);