summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-07-09 19:19:02 (GMT)
committerEvan Martin <martine@danga.com>2012-07-09 19:19:02 (GMT)
commitb90d0387fb821a9f9fc0e15473cd00b1fb89c550 (patch)
tree026c0c528b04e723d42a98211d29a2e5a3b22f8d /src
parent0ca93baf35d3c2b1e70e008276555b5bec2f9f3e (diff)
parent3baedf17677e5d8f0c248d950e0681a0f5668992 (diff)
downloadNinja-b90d0387fb821a9f9fc0e15473cd00b1fb89c550.zip
Ninja-b90d0387fb821a9f9fc0e15473cd00b1fb89c550.tar.gz
Ninja-b90d0387fb821a9f9fc0e15473cd00b1fb89c550.tar.bz2
Merge pull request #357 from tfarina/manifest-parser
Rename parsers.* to manifest_parser.*
Diffstat (limited to 'src')
-rw-r--r--src/build_log_perftest.cc2
-rw-r--r--src/graph.cc2
-rw-r--r--src/manifest_parser.cc (renamed from src/parsers.cc)2
-rw-r--r--src/manifest_parser.h (renamed from src/parsers.h)6
-rw-r--r--src/manifest_parser_test.cc (renamed from src/parsers_test.cc)2
-rw-r--r--src/ninja.cc2
-rw-r--r--src/test.cc2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/build_log_perftest.cc b/src/build_log_perftest.cc
index 51bb51b..02f4c60 100644
--- a/src/build_log_perftest.cc
+++ b/src/build_log_perftest.cc
@@ -17,7 +17,7 @@
#include "build_log.h"
#include "graph.h"
-#include "parsers.h"
+#include "manifest_parser.h"
#include "state.h"
#include "util.h"
diff --git a/src/graph.cc b/src/graph.cc
index 56584e3..071a3b6 100644
--- a/src/graph.cc
+++ b/src/graph.cc
@@ -21,8 +21,8 @@
#include "depfile_parser.h"
#include "disk_interface.h"
#include "explain.h"
+#include "manifest_parser.h"
#include "metrics.h"
-#include "parsers.h"
#include "state.h"
#include "util.h"
diff --git a/src/parsers.cc b/src/manifest_parser.cc
index bc76ba1..057e12c 100644
--- a/src/parsers.cc
+++ b/src/manifest_parser.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "parsers.h"
+#include "manifest_parser.h"
#include <assert.h>
#include <errno.h>
diff --git a/src/parsers.h b/src/manifest_parser.h
index f889156..a2c6c93 100644
--- a/src/parsers.h
+++ b/src/manifest_parser.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef NINJA_PARSERS_H_
-#define NINJA_PARSERS_H_
+#ifndef NINJA_MANIFEST_PARSER_H_
+#define NINJA_MANIFEST_PARSER_H_
#include <string>
#include <vector>
@@ -68,4 +68,4 @@ private:
Lexer lexer_;
};
-#endif // NINJA_PARSERS_H_
+#endif // NINJA_MANIFEST_PARSER_H_
diff --git a/src/parsers_test.cc b/src/manifest_parser_test.cc
index fc83946..9c6644c 100644
--- a/src/parsers_test.cc
+++ b/src/manifest_parser_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "parsers.h"
+#include "manifest_parser.h"
#include <gtest/gtest.h>
diff --git a/src/ninja.cc b/src/ninja.cc
index 6090bdb..809768c 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -42,8 +42,8 @@
#include "explain.h"
#include "graph.h"
#include "graphviz.h"
+#include "manifest_parser.h"
#include "metrics.h"
-#include "parsers.h"
#include "state.h"
#include "util.h"
diff --git a/src/test.cc b/src/test.cc
index afedd10..0138b3a 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -19,7 +19,7 @@
#include <errno.h>
#include "build_log.h"
-#include "parsers.h"
+#include "manifest_parser.h"
#include "util.h"
#ifdef _WIN32