tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

got rid of the STD_SHARED_XX std/tr1 defines

Browse Source
This commit is contained in:
Jean-Francois Dockes
2016-07-13 15:12:25 +02:00
parent 0e0b660ebc
commit 0b0385e459
65 changed files with 219 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/windows/execmd_w.cpp
+4 -4
View File
@@ -23,7 +23,7 @@
#include <string>
#include <iostream>
#include <sstream>
#include UNORDERED_MAP_INCLUDE
#include <unordered_map>
#include "log.h"
#include "safesysstat.h"
@@ -108,12 +108,12 @@ static string argvToCmdLine(const string& cmd, const vector<string>& args)
}
// Merge the father environment with the variable specified in m_env
static char *mergeEnvironment(const STD_UNORDERED_MAP<string, string>& addenv)
static char *mergeEnvironment(const std::unordered_map<string, string>& addenv)
{
// Parse existing environment.
char *envir = GetEnvironmentStrings();
char *cp0 = envir;
STD_UNORDERED_MAP<string, string> envirmap;
std::unordered_map<string, string> envirmap;
string name, value;
for (char *cp1 = cp0;;cp1++) {
@@ -277,7 +277,7 @@ public:
reset();
}
STD_UNORDERED_MAP<string, string> m_env;
std::unordered_map<string, string> m_env;
ExecCmdAdvise *m_advise;
ExecCmdProvide *m_provide;
int m_timeoutMs;