summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-05-07 04:23:49 (GMT)
committerEvan Martin <martine@danga.com>2012-05-07 04:23:49 (GMT)
commit0559ce12dbac9fdb70b9fee4807010c7db20ac9c (patch)
tree3959c887f2a8902a6e1ff29fbef5ae59d4d9aa62
parentcc0cf7aa6a51301a53b6b1870c0492f2e3fe35bb (diff)
parent6bbda7cba2c3c6476db39b73c7e901d9eee3b1e6 (diff)
downloadNinja-0559ce12dbac9fdb70b9fee4807010c7db20ac9c.zip
Ninja-0559ce12dbac9fdb70b9fee4807010c7db20ac9c.tar.gz
Ninja-0559ce12dbac9fdb70b9fee4807010c7db20ac9c.tar.bz2
Merge pull request #299 from tfarina/explicit-ctors
views: Mark single-argument constructors as explicit.
-rw-r--r--src/build.cc2
-rw-r--r--src/build.h2
-rw-r--r--src/graph.cc2
-rw-r--r--src/graph.h10
4 files changed, 10 insertions, 6 deletions
diff --git a/src/build.cc b/src/build.cc
index 03a9d0d..157442d 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -448,7 +448,7 @@ void Plan::Dump() {
}
struct RealCommandRunner : public CommandRunner {
- RealCommandRunner(const BuildConfig& config) : config_(config) {}
+ explicit RealCommandRunner(const BuildConfig& config) : config_(config) {}
virtual ~RealCommandRunner() {}
virtual bool CanRunMore();
virtual bool StartCommand(Edge* edge);
diff --git a/src/build.h b/src/build.h
index ddd9db8..5dcdb5b 100644
--- a/src/build.h
+++ b/src/build.h
@@ -155,7 +155,7 @@ private:
/// Tracks the status of a build: completion fraction, printing updates.
struct BuildStatus {
- BuildStatus(const BuildConfig& config);
+ explicit BuildStatus(const BuildConfig& config);
void PlanHasTotalEdges(int total);
void BuildEdgeStarted(Edge* edge);
void BuildEdgeFinished(Edge* edge, bool success, const string& output,
diff --git a/src/graph.cc b/src/graph.cc
index 1d6d8c7..3531e86 100644
--- a/src/graph.cc
+++ b/src/graph.cc
@@ -177,7 +177,7 @@ bool Edge::AllInputsReady() const {
/// An Env for an Edge, providing $in and $out.
struct EdgeEnv : public Env {
- EdgeEnv(Edge* edge) : edge_(edge) {}
+ explicit EdgeEnv(Edge* edge) : edge_(edge) {}
virtual string LookupVariable(const string& var);
/// Given a span of Nodes, construct a list of paths suitable for a command
diff --git a/src/graph.h b/src/graph.h
index afe4daf..32a859d 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -28,8 +28,11 @@ struct Edge;
/// Information about a node in the dependency graph: the file, whether
/// it's dirty, mtime, etc.
struct Node {
- Node(const string& path) : path_(path), mtime_(-1), dirty_(false),
- in_edge_(NULL) {}
+ explicit Node(const string& path)
+ : path_(path),
+ mtime_(-1),
+ dirty_(false),
+ in_edge_(NULL) {}
/// Return true if the file exists (mtime_ got a value).
bool Stat(DiskInterface* disk_interface);
@@ -97,7 +100,8 @@ private:
/// An invokable build command and associated metadata (description, etc.).
struct Rule {
- Rule(const string& name) : name_(name), generator_(false), restat_(false) { }
+ explicit Rule(const string& name)
+ : name_(name), generator_(false), restat_(false) {}
const string& name() const { return name_; }