summaryrefslogtreecommitdiffstats
path: root/src/ClashAvoider.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-12-25 15:26:48 -0500
committerDavid Robillard <d@drobilla.net>2017-12-25 16:26:13 -0500
commit15b3b0e9f8823752f80c7e597a70749813e61c79 (patch)
tree3f324c6e2a455be8b929456dadbf06520889d435 /src/ClashAvoider.cpp
parentd6a9571641bcb34acb3521feb08eea33195fd9ca (diff)
downloadingen-15b3b0e9f8823752f80c7e597a70749813e61c79.tar.gz
ingen-15b3b0e9f8823752f80c7e597a70749813e61c79.tar.bz2
ingen-15b3b0e9f8823752f80c7e597a70749813e61c79.zip
Always use braces
Diffstat (limited to 'src/ClashAvoider.cpp')
-rw-r--r--src/ClashAvoider.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/ClashAvoider.cpp b/src/ClashAvoider.cpp
index d74915fa..429b582b 100644
--- a/src/ClashAvoider.cpp
+++ b/src/ClashAvoider.cpp
@@ -95,19 +95,22 @@ ClashAvoider::map_path(const Raul::Path& in)
} else {
string parent_str = in.parent().base();
parent_str = parent_str.substr(0, parent_str.find_last_of("/"));
- if (parent_str.empty())
+ if (parent_str.empty()) {
parent_str = "/";
+ }
}
- if (offset == 0)
+ if (offset == 0) {
offset = 2;
+ }
std::stringstream ss;
ss << base_path << "_" << offset;
if (!exists(Raul::Path(ss.str()))) {
std::string name = base_path.symbol();
- if (name == "")
+ if (name == "") {
name = "_";
+ }
Raul::Symbol sym(name);
string str = ss.str();
InsertRecord i = _symbol_map.insert(
@@ -116,10 +119,11 @@ ClashAvoider::map_path(const Raul::Path& in)
_offsets.insert(make_pair(base_path, offset));
return i.first->second;
} else {
- if (o != _offsets.end())
+ if (o != _offsets.end()) {
offset = ++o->second;
- else
+ } else {
++offset;
+ }
}
}
}