From 98909c68844957572f28766312560454fb7b9b97 Mon Sep 17 00:00:00 2001 From: pabs3 Date: Mon, 3 Mar 2008 14:04:53 +0000 Subject: [PATCH] Fix Debian bug #456082: fix FTBFS with GCC 4.3 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5564 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/util.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/util.cpp b/Source/util.cpp index 81e9a114..fb35b5e8 100644 --- a/Source/util.cpp +++ b/Source/util.cpp @@ -374,7 +374,7 @@ string get_full_path(const string &path) { #ifdef PATH_MAX static char buffer[PATH_MAX]; #else//PATH_MAX - int path_max = pathconf(path, _PC_PATH_MAX); + int path_max = pathconf(path.c_str(), _PC_PATH_MAX); if (path_max <= 0) path_max = 4096; char *buffer = (char *) malloc(path_max); @@ -466,9 +466,14 @@ string remove_file_extension(const string& path) { return get_string_prefix(path, "."); } +struct ToLower +{ + char operator() (char c) const { return std::tolower(c); } +}; + string lowercase(const string &str) { string result = str; - transform(str.begin(), str.end(), result.begin(), tolower); + transform(str.begin(), str.end(), result.begin(), ToLower()); return result; }