From 4e92e75274c30622529341a33c7287421b7d9048 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Tue, 24 Sep 2019 15:20:27 +0100 Subject: [PATCH] Fix merge conflict issue --- procmon/processmonitor.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index a35d784dc..b6053d2fe 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -2616,11 +2616,6 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName, tmp = tmp.filename(); DBRMroot = (bf::path(DBRMDir) / tmp).string(); - // DBRMDir might have changed, so need to change DBRMroot - bf::path tmp(DBRMroot); - tmp = tmp.filename(); - DBRMroot = (bf::path(DBRMDir) / tmp).string(); - sendAlarm("DBRM", DBRM_LOAD_DATA_ERROR, CLEAR); // change DBRMroot to temp DBRMDir path // DBRMroot = tempDBRMDir + "/BRM_saves"; @@ -4425,13 +4420,6 @@ int ProcessMonitor::getDBRMdata(string *path) bf::create_directories(pTmp); *path = pTmp.string(); log.writeLog(__LINE__, "Downloading DBRM files to " + *path, LOG_TYPE_DEBUG); - - boost::uuids::uuid u = boost::uuids::random_generator()(); - bf::path pTmp = bf::path(*path) / boost::uuids::to_string(u); - bf::create_directories(pTmp); - *path = pTmp.string(); - log.writeLog(__LINE__, "Downloading DBRM files to " + *path, LOG_TYPE_DEBUG); - for ( int i = 0 ; i < numFiles ; i ++ ) { string fileName; @@ -4476,10 +4464,6 @@ int ProcessMonitor::getDBRMdata(string *path) pFilename = pTmp / pFilename.filename(); const char *cFilename = pFilename.string().c_str(); - bf::path pFilename(fileName); - pFilename = pTmp / pFilename.filename(); - const char *cFilename = pFilename.string().c_str(); - boost::scoped_ptr out(IDBDataFile::open( IDBPolicy::getType(cFilename, IDBPolicy::WRITEENG),