summaryrefslogtreecommitdiffstats
path: root/src/layers.cpp
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-09 16:16:06 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-11 10:13:48 +0200
commitd79d0c83452212355d212e8fcd4ad5c27c1906fc (patch)
tree7d48d577b1f20ba76aa9deec150e3823451370c8 /src/layers.cpp
parentef1b8f5fa4c2e939e9b6f08069ee08d362ee0ee5 (diff)
Remove the DB() makro, replace with logdebug() where sensible
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src/layers.cpp')
-rw-r--r--src/layers.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/layers.cpp b/src/layers.cpp
index 2209847..0110f17 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -25,7 +25,6 @@ namespace wm {
using json = nlohmann::json;
layer::layer(nlohmann::json const &j) {
- DB(j);
if (j["type"] == "range") {
this->id_min = j["first_surface_id"];
this->id_max = j["last_surface_id"];
@@ -45,7 +44,6 @@ layer::layer(nlohmann::json const &j) {
}
struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
- DB(j);
try {
layer_map stl{};
auto m = j["mappings"];
@@ -76,7 +74,7 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
auto jtests = j.value("tests", json());
if (!jtests.empty()) {
- DB("Embedded tests...");
+ logdebug("Embedded tests...");
std::vector<std::pair<int, int>> tests;
tests.reserve(jtests.size());
std::transform(std::cbegin(jtests), std::cend(jtests),
@@ -88,8 +86,7 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
for (auto sid : tests) {
int lid = stl.get_layer_id(sid.first).value_or(-1);
- DB("this=" << sid.first << ", that=" << lid
- << ", expect=" << sid.second);
+ logdebug("this=%d, that=%d, expect=%d", sid.first, lid, sid.second);
if (lid != sid.second) {
return Err<layer_map>("ID Map embedded test failed!");
}