From d998580e10fa27408a81bd1f4ec0de7422ae9cf8 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 29 Mar 2012 02:11:02 +0200 Subject: [PATCH] argument to mono_directive must be const string, or passing temporaries to it is forbidden by C++. --- indra/newview/fslslpreproc.cpp | 2 +- indra/newview/fslslpreproc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/fslslpreproc.cpp b/indra/newview/fslslpreproc.cpp index 51015e1ecd..e46a003389 100644 --- a/indra/newview/fslslpreproc.cpp +++ b/indra/newview/fslslpreproc.cpp @@ -1176,7 +1176,7 @@ void FSLSLPreprocessor::display_error(std::string err) } -bool FSLSLPreprocessor::mono_directive(std::string& text, bool agent_inv) +bool FSLSLPreprocessor::mono_directive(std::string const& text, bool agent_inv) { bool domono = agent_inv; diff --git a/indra/newview/fslslpreproc.h b/indra/newview/fslslpreproc.h index ec0056a1f1..ac27548ce2 100644 --- a/indra/newview/fslslpreproc.h +++ b/indra/newview/fslslpreproc.h @@ -43,7 +43,7 @@ public: : mCore(corep), waving(FALSE), mClose(FALSE) {} - static bool mono_directive(std::string& text, bool agent_inv = true); + static bool mono_directive(std::string const& text, bool agent_inv = true); std::string encode(std::string script); std::string decode(std::string script);