Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/elfmz/far2l.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelfmz <fenix1905@tut.by>2022-11-10 01:52:21 +0300
committerelfmz <fenix1905@tut.by>2022-11-10 01:52:21 +0300
commit839724f788af6f3bcf60db9fa927c0e644e9da2b (patch)
tree3130d04499d6ab010af6cda76b95aaac8579b788
parent6204f3cfdc9b729fc581c8f0d3bec1485168ae21 (diff)
minor compilation fix.. maybe (touch #1398 #1397)
-rw-r--r--colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.cpp13
-rw-r--r--colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.h1
2 files changed, 7 insertions, 7 deletions
diff --git a/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.cpp b/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.cpp
index e5e14b8f..fdbabb1c 100644
--- a/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.cpp
+++ b/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.cpp
@@ -1,8 +1,6 @@
#include <colorer/parsers/FileTypeImpl.h>
#include <colorer/unicode/UnicodeTools.h>
-#include <memory>
-
FileTypeImpl::FileTypeImpl(HRCParserImpl* hrcParser): name(nullptr), group(nullptr), description(nullptr)
{
this->hrcParser = hrcParser;
@@ -72,11 +70,12 @@ const String* FileTypeImpl::getParamUserValue(const String &name) const{
}
TypeParameter* FileTypeImpl::addParam(const String *name){
- auto* tp = new TypeParameter;
- tp->name.reset(new SString(name));
- std::pair<SString, TypeParameter*> pp(name, tp);
- paramsHash.emplace(pp);
- return tp;
+ const auto &ir = paramsHash.emplace(name, std::unique_ptr<TypeParameter>());
+ if (ir.second) {
+ ir.first->second.reset(new TypeParameter);
+ ir.first->second->name.reset(new SString(name));
+ }
+ return ir.first->second.get();
}
void FileTypeImpl::setParamValue(const String &name, const String *value){
diff --git a/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.h b/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.h
index 12e5c85c..77ece735 100644
--- a/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.h
+++ b/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.h
@@ -3,6 +3,7 @@
#include <vector>
#include <unordered_map>
+#include <memory>
#include <colorer/parsers/HRCParserImpl.h>
#include <colorer/parsers/FileTypeChooser.h>