Merge pull request #316 from tfarina/struct

No need to write 'struct' before type name when declaraing variables in ...

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_