aboutsummaryrefslogtreecommitdiff
path: root/build/target
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-02-20 09:38:38 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-02-20 09:38:38 +0200
commit90ae462a44a1478e1c4be1568997b6873f6e688d (patch)
tree26af054dea912de192b243c174da23061c57c444 /build/target
parentc23346c4cda9e0c2318c302dc6014d3fef53a6d3 (diff)
Rename 'directory' to 'dir' in target, prerequisite
Diffstat (limited to 'build/target')
-rw-r--r--build/target8
1 files changed, 4 insertions, 4 deletions
diff --git a/build/target b/build/target
index b84931c..be85a41 100644
--- a/build/target
+++ b/build/target
@@ -46,9 +46,9 @@ namespace build
{
public:
target (path d, std::string n, const std::string* e)
- : directory (std::move (d)), name (std::move (n)), ext (e) {}
+ : dir (std::move (d)), name (std::move (n)), ext (e) {}
- const path directory; // Absolute and normalized.
+ const path dir; // Absolute and normalized.
const std::string name;
const std::string* ext; // Extension, NULL means unspecified.
@@ -105,8 +105,8 @@ namespace build
return
(tx < ty) ||
(tx == ty && x.name < y.name) ||
- (tx == ty && x.name == y.name && x.directory < y.directory) ||
- (tx == ty && x.name == y.name && x.directory == y.directory &&
+ (tx == ty && x.name == y.name && x.dir < y.dir) ||
+ (tx == ty && x.name == y.name && x.dir == y.dir &&
x.ext != nullptr && y.ext != nullptr && x.ext < y.ext);
}