Move std::string str_validate to separate header

This is to fix compilation of squirrel on MacOS/clang, as squirrel
defines macros which clash with including <string>
This commit is contained in:
Jonathan G Rennison
2017-04-11 18:39:27 +01:00
parent 86d1a00ba6
commit cb9ffe1bd9
4 changed files with 25 additions and 8 deletions

23
src/string_func_extra.h Normal file
View File

@@ -0,0 +1,23 @@
/* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef STRING_FUNC_EXTRA_H
#define STRING_FUNC_EXTRA_H
#include "string_func.h"
#include <string>
static inline void str_validate(std::string &str, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK)
{
if (str.empty()) return;
char *buf = const_cast<char *>(str.c_str());
str.resize(str_validate_intl(buf, buf + str.size(), settings) - buf);
}
#endif /* STRING_FUNC_EXTRA_H */