diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-04-09 07:55:34 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-04-09 07:57:47 -0400 |
| commit | a04440feb9c93507f6248a37dfa82c548cede82e (patch) | |
| tree | cd0e2ac953e382149f87a350d50b91285eb6bf6f /src/interfaces | |
| parent | 6fc5a050f216109bcd9b6ac099a3dd9518701f65 (diff) | |
| parent | c36b720d009f1ab1c3900750e05c1f17412e564d (diff) | |
Merge #11878: Add Travis check for duplicate includes
c36b720d00 Add Travis check for duplicate includes (practicalswift)
280023f31d Remove duplicate includes (practicalswift)
Pull request description:
This enforces parts of the project header include guidelines (added by @sipa in #10575).
Example run:
```
$ git diff
diff --git a/src/warnings.cpp b/src/warnings.cpp
index c52a1fd..d8994dd 100644
--- a/src/warnings.cpp
+++ b/src/warnings.cpp
@@ -5,6 +5,8 @@
#include <sync.h>
#include <clientversion.h>
+#include <string>
#include <util.h>
#include <warnings.h>
+#include <util.h>
diff --git a/src/warnings.h b/src/warnings.h
index e8e982c..8d2252e 100644
--- a/src/warnings.h
+++ b/src/warnings.h
@@ -7,6 +7,7 @@
#define BITCOIN_WARNINGS_H
#include <stdlib.h>
#include <string>
+#include <stdlib.h>
void SetMiscWarning(const std::string& strWarning);
$ contrib/devtools/lint-includes.sh
Duplicate include(s) in src/warnings.h:
#include <stdlib.h>
Include(s) from src/warnings.h duplicated in src/warnings.cpp:
#include <string>
Duplicate include(s) in src/warnings.cpp:
#include <util.h>
$ echo $?
1
$ git checkout .
$ contrib/devtools/lint-includes.sh
$ echo $?
0
```
Tree-SHA512: f653d23c58ebc024dfc5b1fb8570698fd3c515c75b60b5cabbc43595548c488fca92349fa4c8b64460edbe61c879ff1d24f37f959e18552e202a7342460ddbf1
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/handler.cpp | 1 | ||||
| -rw-r--r-- | src/interfaces/wallet.cpp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/interfaces/handler.cpp b/src/interfaces/handler.cpp index 1443fe9f18..8e45faa2a5 100644 --- a/src/interfaces/handler.cpp +++ b/src/interfaces/handler.cpp @@ -7,7 +7,6 @@ #include <util.h> #include <boost/signals2/connection.hpp> -#include <memory> #include <utility> namespace interfaces { diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index 0244fe70f5..21543552db 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -22,8 +22,6 @@ #include <wallet/feebumper.h> #include <wallet/wallet.h> -#include <memory> - namespace interfaces { namespace { |