From b3f3f53e0120dd822cd6e8eb15fe11dad6aeef0c Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 10 Sep 2019 09:36:51 +0200 Subject: [PATCH] interrogate: fix missing std:: prefix for string_holder --- dtool/src/interrogate/parameterRemapBasicStringToString.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dtool/src/interrogate/parameterRemapBasicStringToString.cxx b/dtool/src/interrogate/parameterRemapBasicStringToString.cxx index 21faabfaac..46ce08c9c7 100644 --- a/dtool/src/interrogate/parameterRemapBasicStringToString.cxx +++ b/dtool/src/interrogate/parameterRemapBasicStringToString.cxx @@ -51,7 +51,7 @@ pass_parameter(ostream &out, const string &variable_name) { string ParameterRemapBasicStringToString:: prepare_return_expr(ostream &out, int indent_level, const string &expression) { InterfaceMaker::indent(out, indent_level) - << "static string string_holder = " << expression << ";\n"; + << "static std::string string_holder = " << expression << ";\n"; return "string_holder"; } @@ -97,7 +97,7 @@ pass_parameter(ostream &out, const string &variable_name) { string ParameterRemapBasicWStringToWString:: prepare_return_expr(ostream &out, int indent_level, const string &expression) { InterfaceMaker::indent(out, indent_level) - << "static wstring string_holder = " << expression << ";\n"; + << "static std::wstring string_holder = " << expression << ";\n"; return "string_holder"; }