* Licence details can be found in the file COPYING.
*
* \author Angus Leeming
- * \author João Luis M. Assirati
- * \author Lars Gullik Bjønnes
+ * \author João Luis M. Assirati
+ * \author Lars Gullik Bjønnes
*
* Full author contact details are available in file CREDITS.
*/
#include <map>
#include <sstream>
-using std::string;
-using std::vector;
-
+using namespace std;
namespace lyx {
namespace support {
Tokenizer::const_iterator it = tokens.begin();
Tokenizer::const_iterator const end = tokens.end();
- std::vector<string> vars;
+ vector<string> vars;
for (; it != end; ++it)
vars.push_back(os::internal_path(*it));
string const encoded = to_local8bit(from_utf8(value));
#if defined (HAVE_SETENV)
- return ::setenv(name.c_str(), encoded.c_str(), true);
+ return ::setenv(name.c_str(), encoded.c_str(), 1) == 0;
#elif defined (HAVE_PUTENV)
- static std::map<string, string> varmap;
+ static map<string, string> varmap;
varmap[name] = name + '=' + encoded;
- return ::putenv(varmap[name].c_str()) == 0;
+ return ::putenv(const_cast<char*>(varmap[name].c_str())) == 0;
#else
#error No environment-setting function has been defined.
#endif
void setEnvPath(string const & name, vector<string> const & env)
{
char const separator(os::path_separator());
- std::ostringstream ss;
+ ostringstream ss;
vector<string>::const_iterator const begin = env.begin();
vector<string>::const_iterator const end = env.end();
vector<string>::const_iterator it = begin;
token_iterator const end = reversed_tokens.rend();
for (; it != end; ++it) {
vector<string>::iterator remove_it =
- std::remove(env_var.begin(), env_var.end(), *it);
+ remove(env_var.begin(), env_var.end(), *it);
env_var.erase(remove_it, env_var.end());
env_var.insert(env_var.begin(), *it);
}