Fix nits

Author: glankk

simplecpp.cpp

@@ -2988,18 +2988,18 @@ static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const
     return "";
 }
 
-std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::tryload(const FileDataCache::name_map_type::iterator &name_it, const simplecpp::DUI &dui, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
+std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::tryload(FileDataCache::name_map_type::iterator &name_it, const simplecpp::DUI &dui, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
 {
     const std::string &path = name_it->first;
     FileID fileId;
 
     if (!getFileId(path, fileId))
-        return std::make_pair(nullptr, false);
+        return {nullptr, false};
 
     const auto id_it = mIdMap.find(fileId);
     if (id_it != mIdMap.end()) {
         name_it->second = id_it->second;
-        return std::make_pair(id_it->second, false);
+        return {id_it->second, false};
     }
 
     std::ifstream f(path);
@@ -3009,53 +3009,56 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::tryload(const F
         data->tokens.removeComments();
 
     name_it->second = data;
-    mIdMap.insert(std::make_pair(fileId, data));
-    mData.push_back(std::unique_ptr<FileData>(data));
+    mIdMap.emplace(fileId, data);
+    mData.emplace_back(data);
 
-    return std::make_pair(data, true);
+    return {data, true};
 }
 
 std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
 {
     if (isAbsolutePath(header)) {
-        const auto ins = mNameMap.insert(std::make_pair(simplecpp::simplifyPath(header), nullptr));
+        auto ins = mNameMap.emplace(simplecpp::simplifyPath(header), nullptr);
 
         if (ins.second) {
             const auto ret = tryload(ins.first, dui, filenames, outputList);
-            if (ret.first != nullptr)
+            if (ret.first != nullptr) {
                 return ret;
+            }
         } else {
-            return std::make_pair(ins.first->second, false);
+            return {ins.first->second, false};
         }
 
-        return std::make_pair(nullptr, false);
+        return {nullptr, false};
     }
 
     if (!systemheader) {
-        const auto ins = mNameMap.insert(std::make_pair(simplecpp::simplifyPath(dirPath(sourcefile) + header), nullptr));
+        auto ins = mNameMap.emplace(simplecpp::simplifyPath(dirPath(sourcefile) + header), nullptr);
 
         if (ins.second) {
             const auto ret = tryload(ins.first, dui, filenames, outputList);
-            if (ret.first != nullptr)
+            if (ret.first != nullptr) {
                 return ret;
+            }
         } else if (ins.first->second != nullptr) {
-            return std::make_pair(ins.first->second, false);
+            return {ins.first->second, false};
         }
     }
 
     for (const auto &includePath : dui.includePaths) {
-        const auto ins = mNameMap.insert(std::make_pair(simplecpp::simplifyPath(includePath + "/" + header), nullptr));
+        auto ins = mNameMap.emplace(simplecpp::simplifyPath(includePath + "/" + header), nullptr);
 
         if (ins.second) {
             const auto ret = tryload(ins.first, dui, filenames, outputList);
-            if (ret.first != nullptr)
+            if (ret.first != nullptr) {
                 return ret;
+            }
         } else if (ins.first->second != nullptr) {
-            return std::make_pair(ins.first->second, false);
+            return {ins.first->second, false};
         }
     }
 
-    return std::make_pair(nullptr, false);
+    return {nullptr, false};
 }
 
 bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)

simplecpp.h

@@ -419,8 +419,8 @@ namespace simplecpp {
         void insert(FileData data) {
             FileData *const newdata = new FileData(std::move(data));
 
-            mData.push_back(std::unique_ptr<FileData>(newdata));
-            mNameMap.insert(std::make_pair(newdata->filename, newdata));
+            mData.emplace_back(newdata);
+            mNameMap.emplace(newdata->filename, newdata);
         }
 
         void clear() {
@@ -500,7 +500,7 @@ namespace simplecpp {
 
         static bool getFileId(const std::string &path, FileID &id);
 
-        std::pair<FileData *, bool> tryload(const name_map_type::iterator &name_it, const DUI &dui, std::vector<std::string> &filenames, OutputList *outputList);
+        std::pair<FileData *, bool> tryload(name_map_type::iterator &name_it, const DUI &dui, std::vector<std::string> &filenames, OutputList *outputList);
 
         container_type mData;
         name_map_type mNameMap;