summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/gn/builder_unittest.cc14
-rw-r--r--tools/gn/command_desc.cc5
-rw-r--r--tools/gn/trace.cc4
-rw-r--r--tools/imagediff/image_diff_png.cc7
4 files changed, 2 insertions, 28 deletions
diff --git a/tools/gn/builder_unittest.cc b/tools/gn/builder_unittest.cc
index e605b9e..34824ba 100644
--- a/tools/gn/builder_unittest.cc
+++ b/tools/gn/builder_unittest.cc
@@ -35,20 +35,8 @@ class MockLoader : public Loader {
return files_.empty();
}
- // Returns true if one load has been requested and it matches the given
+ // Returns true if two loads have been requested and they match the given
// file. This will clear the records so it will be empty for the next call.
- bool HasLoadedOne(const SourceFile& f) {
- if (files_.size() != 1u) {
- files_.clear();
- return false;
- }
-
- bool match = (files_[0] == f);
- files_.clear();
- return match;
- }
-
- // Like HasLoadedOne above. Accepts any ordering.
bool HasLoadedTwo(const SourceFile& a, const SourceFile& b) {
if (files_.size() != 2u) {
files_.clear();
diff --git a/tools/gn/command_desc.cc b/tools/gn/command_desc.cc
index 4917dcf..a4a7fd0 100644
--- a/tools/gn/command_desc.cc
+++ b/tools/gn/command_desc.cc
@@ -186,11 +186,6 @@ template<> struct DescValueWriter<std::string> {
out << " " << str << "\n";
}
};
-template<> struct DescValueWriter<SourceFile> {
- void operator()(const SourceFile& file, std::ostream& out) const {
- out << " " << file.value() << "\n";
- }
-};
template<> struct DescValueWriter<SourceDir> {
void operator()(const SourceDir& dir, std::ostream& out) const {
out << " " << FormatSourceDir(dir) << "\n";
diff --git a/tools/gn/trace.cc b/tools/gn/trace.cc
index 26fb276..a2f34a3 100644
--- a/tools/gn/trace.cc
+++ b/tools/gn/trace.cc
@@ -24,9 +24,7 @@ class TraceLog {
TraceLog() {
events_.reserve(16384);
}
- ~TraceLog() {
- // Trace items leanked intentionally.
- }
+ // Trace items leaked intentionally.
void Add(TraceItem* item) {
base::AutoLock lock(lock_);
diff --git a/tools/imagediff/image_diff_png.cc b/tools/imagediff/image_diff_png.cc
index a34a799..7524026 100644
--- a/tools/imagediff/image_diff_png.cc
+++ b/tools/imagediff/image_diff_png.cc
@@ -37,13 +37,6 @@ enum ColorFormat {
// Represents a comment in the tEXt ancillary chunk of the png.
struct Comment {
- Comment(const std::string& k, const std::string& t)
- : key(k), text(t) {
- }
-
- ~Comment() {
- };
-
std::string key;
std::string text;
};