aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2016-12-11 12:36:04 +0100
committerAdrian Kummerlaender2016-12-11 12:37:09 +0100
commitdbbef17103dc21c085c8b5713433fb730a5f8d3a (patch)
treea5c19ae0d025a7d94a93afdfb662eea33e599ea6
parent93c5f7356364bd6e0276dddd0a78bcb50085629f (diff)
downloadtermlife-dbbef17103dc21c085c8b5713433fb730a5f8d3a.tar
termlife-dbbef17103dc21c085c8b5713433fb730a5f8d3a.tar.gz
termlife-dbbef17103dc21c085c8b5713433fb730a5f8d3a.tar.bz2
termlife-dbbef17103dc21c085c8b5713433fb730a5f8d3a.tar.lz
termlife-dbbef17103dc21c085c8b5713433fb730a5f8d3a.tar.xz
termlife-dbbef17103dc21c085c8b5713433fb730a5f8d3a.tar.zst
termlife-dbbef17103dc21c085c8b5713433fb730a5f8d3a.zip
Move `util` namespace classes into matching folder
-rw-r--r--src/util/box_indicator.h (renamed from src/box_indicator.h)10
-rw-r--r--src/util/box_traverser.h (renamed from src/box_traverser.h)6
-rw-r--r--src/world.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/box_indicator.h b/src/util/box_indicator.h
index db750e4..c0493c7 100644
--- a/src/box_indicator.h
+++ b/src/util/box_indicator.h
@@ -1,5 +1,5 @@
-#ifndef LIFE_SRC_BOX_INDICATOR_
-#define LIFE_SRC_BOX_INDICATOR_
+#ifndef LIFE_SRC_UTIL_BOX_INDICATOR_
+#define LIFE_SRC_UTIL_BOX_INDICATOR_
namespace life {
namespace util {
@@ -25,7 +25,7 @@ class BoxIndicator {
&& y >= this->a_y_
&& y < this->b_y_;
}
-
+
protected:
const std::size_t a_x_;
const std::size_t a_y_;
@@ -33,8 +33,8 @@ class BoxIndicator {
const std::size_t b_y_;
};
-
+
}
}
-#endif // LIFE_SRC_BOX_INDICATOR_
+#endif // LIFE_SRC_UTIL_BOX_INDICATOR_
diff --git a/src/box_traverser.h b/src/util/box_traverser.h
index 1bc0edd..cb7dfeb 100644
--- a/src/box_traverser.h
+++ b/src/util/box_traverser.h
@@ -1,5 +1,5 @@
-#ifndef LIFE_SRC_BOX_TRAVERSER_
-#define LIFE_SRC_BOX_TRAVERSER_
+#ifndef LIFE_SRC_UTIL_BOX_TRAVERSER_
+#define LIFE_SRC_UTIL_BOX_TRAVERSER_
#include <functional>
@@ -23,4 +23,4 @@ struct BoxTraverser : public BoxIndicator {
}
}
-#endif // LIFE_SRC_BOX_TRAVERSER_
+#endif // LIFE_SRC_UTIL_BOX_TRAVERSER_
diff --git a/src/world.h b/src/world.h
index b60c658..fde9762 100644
--- a/src/world.h
+++ b/src/world.h
@@ -6,7 +6,7 @@
#include <tuple>
#include <cstdint>
-#include "box_traverser.h"
+#include "util/box_traverser.h"
namespace life {