Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfclem <foucault.clem@gmail.com>2018-08-09 16:27:19 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-08-09 16:51:23 +0300
commita241286859114c6091a86186aa680d638917a05a (patch)
tree58881645cc3e86d661fd53c6025ac993c87c2fba /intern/cycles/util
parent3aee3bbac7317d205b611b9aa713791f17104556 (diff)
Cycles: Util, add to_string() with some helper
Currently unused, but will allow to convert unknown argument type to a string for reporting and such.
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_string.cpp5
-rw-r--r--intern/cycles/util/util_string.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/intern/cycles/util/util_string.cpp b/intern/cycles/util/util_string.cpp
index 995f5d3df27..47119e90a45 100644
--- a/intern/cycles/util/util_string.cpp
+++ b/intern/cycles/util/util_string.cpp
@@ -168,6 +168,11 @@ string string_from_bool(bool var)
return "False";
}
+string to_string(const char *str)
+{
+ return string(str);
+}
+
/* Wide char strings helpers for Windows. */
#ifdef _WIN32
diff --git a/intern/cycles/util/util_string.h b/intern/cycles/util/util_string.h
index 7dfa97335a9..3a4f4398158 100644
--- a/intern/cycles/util/util_string.h
+++ b/intern/cycles/util/util_string.h
@@ -29,6 +29,7 @@ using std::string;
using std::stringstream;
using std::ostringstream;
using std::istringstream;
+using std::to_string;
#ifdef __GNUC__
#define PRINTF_ATTRIBUTE __attribute__((format(printf, 1, 2)))
@@ -49,6 +50,7 @@ bool string_endswith(const string& s, const char *end);
string string_strip(const string& s);
string string_remove_trademark(const string& s);
string string_from_bool(const bool var);
+string to_string(const char *str);
/* Wide char strings are only used on Windows to deal with non-ascii
* characters in file names and such. No reason to use such strings