diff options
author | Evan Martin <martine@danga.com> | 2012-06-17 01:54:07 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2012-06-17 01:54:07 (GMT) |
commit | e152414a933a57b9ee22d51d8bebf3c2e2839f08 (patch) | |
tree | 84c6aeda71301f49dfcb42e4ad91f7b204f1ebd4 | |
parent | 1a871421636092f11af288fa441412654edda49f (diff) | |
parent | 70789ec61c4b96b2a3c575182897d58211df1206 (diff) | |
download | Ninja-e152414a933a57b9ee22d51d8bebf3c2e2839f08.zip Ninja-e152414a933a57b9ee22d51d8bebf3c2e2839f08.tar.gz Ninja-e152414a933a57b9ee22d51d8bebf3c2e2839f08.tar.bz2 |
Merge pull request #316 from tfarina/struct
No need to write 'struct' before type name when declaraing variables in ...
-rw-r--r-- | src/build.h | 9 | ||||
-rw-r--r-- | src/state.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/build.h b/src/build.h index 451c534..c9ee4ac 100644 --- a/src/build.h +++ b/src/build.h @@ -27,8 +27,9 @@ using namespace std; #include "util.h" // int64_t struct BuildLog; -struct Edge; +struct BuildStatus; struct DiskInterface; +struct Edge; struct Node; struct State; @@ -144,10 +145,10 @@ struct Builder { Plan plan_; DiskInterface* disk_interface_; auto_ptr<CommandRunner> command_runner_; - struct BuildStatus* status_; - struct BuildLog* log_; + BuildStatus* status_; + BuildLog* log_; -private: + private: // Unimplemented copy ctor and operator= ensure we don't copy the auto_ptr. Builder(const Builder &other); // DO NOT IMPLEMENT void operator=(const Builder &other); // DO NOT IMPLEMENT diff --git a/src/state.h b/src/state.h index 845c947..23ca12b 100644 --- a/src/state.h +++ b/src/state.h @@ -72,7 +72,7 @@ struct State { BindingEnv bindings_; vector<Node*> defaults_; - struct BuildLog* build_log_; + BuildLog* build_log_; }; #endif // NINJA_STATE_H_ |