Cleanup

.clang-format

@@ -59,12 +59,17 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: '^<.*\.h>'
+  # eckit headers
+  - Regex: '"eckit/.*"'
     Priority: 1
-  - Regex: "^<.*"
+    SortPriority: 0
+  # Other project headers (quoted)
+  - Regex: '".*"'
     Priority: 2
-  - Regex: ".*"
+  # System / third-party headers (angle brackets)
+  - Regex: '<.*>'
     Priority: 3
 IncludeIsMainRegex: "([-_](test|unittest))?$"
 IndentCaseLabels: true

CMakeLists.txt

@@ -266,6 +266,12 @@ ecbuild_add_option( FEATURE HIP
                     DESCRIPTION "HIP GPU linear algebra operations"
                     REQUIRED_PACKAGES hip hipsparse )
 
+### Self-contained header compilation test
+
+ecbuild_add_option( FEATURE TEST_SELF_CONTAINED_HEADERS
+                    DEFAULT OFF
+                    DESCRIPTION "Test that each public header compiles standalone" )
+
 ### Performance tests
 
 ecbuild_add_option( FEATURE EXTRA_TESTS

regressions/ECKIT-166.cc

@@ -5,11 +5,11 @@ BUG ECKIT-166
 
 */
 
-#include <iostream>
-
 #include "eckit/mpi/Comm.h"
 #include "eckit/runtime/Main.h"
 
+#include <iostream>
+
 using namespace eckit;
 
 void run(int argc, char** argv) {

regressions/ECKIT-175.cc

@@ -28,14 +28,15 @@ BUG ECKIT-175
 
 */
 
-#include <cstdlib>
-#include <iostream>
-#include <map>
-
+#include "eckit/log/Channel.h"
 #include "eckit/log/Log.h"
 #include "eckit/runtime/Main.h"
 #include "eckit/runtime/Tool.h"
 
+#include <cstdlib>
+#include <iostream>
+#include <string>
+
 using namespace eckit;
 
 void myrun() {

regressions/ECKIT-221.cc

@@ -7,16 +7,18 @@ FEATURE ECKIT-221
 
 */
 
-#include <cstdlib>
-#include <iostream>
-#include <map>
-#include <memory>
-
+#include "eckit/filesystem/PathName.h"
 #include "eckit/io/DataHandle.h"
+#include "eckit/io/SharedBuffer.h"
 #include "eckit/mpi/Comm.h"
 #include "eckit/runtime/Tool.h"
 #include "eckit/utils/Translator.h"
 
+#include <cstdlib>
+#include <iostream>
+#include <memory>
+#include <string>
+
 using namespace eckit;
 
 class MyTool : public Tool {

src/eckit/bases/Loader.h

@@ -11,11 +11,7 @@
 // File Loader.h
 // Baudouin Raoult - ECMWF Jul 96
 
-#ifndef eckit_Loader_h
-#define eckit_Loader_h
-
-#include "eckit/eckit.h"
-
+#pragma once
 #include "eckit/container/ClassExtent.h"
 
 //-----------------------------------------------------------------------------
@@ -41,5 +37,3 @@ class Loader : public ClassExtent<Loader> {
 //-----------------------------------------------------------------------------
 
 }  // namespace eckit
-
-#endif

src/eckit/bases/Watcher.h

@@ -11,9 +11,7 @@
 // File Watcher.h
 // Baudouin Raoult - ECMWF Jun 98
 
-#ifndef eckit_Watcher_h
-#define eckit_Watcher_h
-
+#pragma once
 //-----------------------------------------------------------------------------
 
 namespace eckit {
@@ -36,5 +34,3 @@ class Watcher {
 //-----------------------------------------------------------------------------
 
 }  // namespace eckit
-
-#endif

src/eckit/cmd/AliasCmd.cc

@@ -9,7 +9,11 @@
  */
 
 #include "eckit/cmd/AliasCmd.h"
+
+#include "eckit/cmd/Arg.h"
+#include "eckit/cmd/CmdArg.h"
 #include "eckit/cmd/CmdParser.h"
+#include "eckit/value/Value.h"
 
 //----------------------------------------------------------------------------------------------------------------------
 

src/eckit/cmd/AliasCmd.h

@@ -11,11 +11,12 @@
 /// @author Manuel Fuentes
 /// @date   Jan 1997
 
-#ifndef eckit_cmd_AliasCmd_H
-#define eckit_cmd_AliasCmd_H
-
+#pragma once
 #include "eckit/cmd/CmdResource.h"
 
+#include <iosfwd>
+#include <string>
+
 
 namespace eckit {
 
@@ -52,5 +53,3 @@ class AliasCmd : public CmdResource {
 //----------------------------------------------------------------------------------------------------------------------
 
 }  // namespace eckit
-
-#endif

src/eckit/cmd/Arg.cc

@@ -10,6 +10,7 @@
 
 #include "eckit/cmd/Arg.h"
 
+#include <cstddef>
 #include <iostream>
 
 namespace eckit {

src/eckit/cmd/Arg.h

@@ -11,9 +11,7 @@
 /// @author Manuel Fuentes
 /// @date   Jan 1997
 
-#ifndef eckit_cmd_Arg_H
-#define eckit_cmd_Arg_H
-
+#pragma once
 #include <iosfwd>
 #include <memory>
 #include <string>
@@ -90,5 +88,3 @@ class Arg {
 //-----------------------------------------------------------------------------
 
 }  // namespace eckit
-
-#endif

src/eckit/cmd/CmdApplication.cc

@@ -12,16 +12,25 @@
 /// @author Florian Rathgeber
 /// @date   June 2015
 
-#include <unistd.h>
-#include <fstream>
-
 #include "eckit/cmd/CmdApplication.h"
+
 #include "eckit/config/Resource.h"
 #include "eckit/filesystem/PathName.h"
 #include "eckit/io/SockBuf.h"
+#include "eckit/log/Channel.h"
+#include "eckit/log/CodeLocation.h"
+#include "eckit/log/Log.h"
 #include "eckit/net/TCPServer.h"
+#include "eckit/net/TCPSocket.h"
 #include "eckit/runtime/Main.h"
 #include "eckit/runtime/Monitor.h"
+#include "eckit/types/Types.h"
+
+#include <exception>
+#include <fstream>
+#include <iostream>
+#include <unistd.h>
+#include <vector>
 
 namespace eckit {
 

src/eckit/cmd/CmdApplication.h

@@ -12,11 +12,12 @@
 /// @author Florian Rathgeber
 /// @date   June 2015
 
-#ifndef eckit_cmd_CmdApplication_H
-#define eckit_cmd_CmdApplication_H
-
+#pragma once
 #include "eckit/cmd/CmdParser.h"
 
+#include <iosfwd>
+#include <string>
+
 namespace eckit {
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -45,5 +46,3 @@ class CmdApplication : public Prompter {
 //----------------------------------------------------------------------------------------------------------------------
 
 }  // namespace eckit
-
-#endif

src/eckit/cmd/CmdArg.cc

@@ -9,9 +9,15 @@
  */
 
 #include "eckit/cmd/CmdArg.h"
+
+#include "eckit/log/Channel.h"
+#include "eckit/log/Log.h"
 #include "eckit/utils/Translator.h"
 #include "eckit/value/Value.h"
 
+#include <ostream>
+#include <utility>
+
 //----------------------------------------------------------------------------------------------------------------------
 
 namespace eckit {

src/eckit/cmd/CmdArg.h

@@ -8,13 +8,20 @@
  * nor does it submit to any jurisdiction.
  */
 
-#ifndef eckit_cmd_CmdArg_H
-#define eckit_cmd_CmdArg_H
-
+#pragma once
 #include "eckit/config/Resource.h"
+#include "eckit/serialisation/Reanimator.h"
+#include "eckit/serialisation/Stream.h"
 #include "eckit/serialisation/Streamable.h"
 #include "eckit/value/Value.h"
 
+#include <cstddef>
+#include <functional>
+#include <iosfwd>
+#include <map>
+#include <string>
+#include <vector>
+
 //-----------------------------------------------------------------------------
 
 namespace eckit {
@@ -115,5 +122,3 @@ class CmdArg : public eckit::Streamable {
 //-----------------------------------------------------------------------------
 
 }  // namespace eckit
-
-#endif

src/eckit/cmd/CmdParser.cc

@@ -8,16 +8,29 @@
  * nor does it submit to any jurisdiction.
  */
 
-#include <cstring>
-#include <iomanip>
-#include <stack>
-
 #include "eckit/cmd/CmdParser.h"
+
+#include "eckit/cmd/CmdArg.h"
 #include "eckit/cmd/CmdResource.h"
-#include "eckit/filesystem/PathName.h"
+#include "eckit/cmd/UserInput.h"
+#include "eckit/exception/Exceptions.h"
+#include "eckit/log/Channel.h"
 #include "eckit/log/Log.h"
 #include "eckit/runtime/Main.h"
 #include "eckit/utils/Tokenizer.h"
+#include "eckit/value/Value.h"
+
+#include <algorithm>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <exception>
+#include <functional>
+#include <iomanip>
+#include <list>
+#include <map>
+#include <stack>
 
 #define YY_INPUT(buf, result, max_size)                  \
     {                                                    \
@@ -70,6 +83,7 @@ namespace CmdYacc {
 void eckit_cmd_error(const char* msg);
 
 #include "eckit/cmd/cmdsy.c"
+
 int eckit_cmd_wrap(void) {
     return 1;
 }

src/eckit/cmd/CmdParser.h

@@ -12,14 +12,11 @@
 /// @author Florian Rathgeber
 /// @date   June 2015
 
-#ifndef eckit_cmd_CmdParser_H
-#define eckit_cmd_CmdParser_H
-
+#pragma once
 #include <iostream>
+#include <string>
 #include <vector>
 
-#include "eckit/cmd/UserInput.h"
-
 namespace eckit {
 
 class CmdArg;
@@ -100,5 +97,3 @@ class CmdParser {
 //-----------------------------------------------------------------------------
 
 }  // namespace eckit
-
-#endif

src/eckit/cmd/CmdResource.cc

@@ -8,24 +8,31 @@
  * nor does it submit to any jurisdiction.
  */
 
-#include <unistd.h>
-
-#include <algorithm>
-#include <fstream>
-#include <iomanip>
+#include "eckit/cmd/CmdResource.h"
 
 #include "eckit/cmd/CmdArg.h"
 #include "eckit/cmd/CmdParser.h"
-#include "eckit/cmd/CmdResource.h"
 #include "eckit/cmd/TermBuf.h"
-
 #include "eckit/config/Resource.h"
+#include "eckit/exception/Exceptions.h"
+#include "eckit/io/AutoCloser.h"
 #include "eckit/io/StdPipe.h"
 #include "eckit/io/StdioBuf.h"
+#include "eckit/log/Channel.h"
+#include "eckit/log/CodeLocation.h"
 #include "eckit/log/Log.h"
 #include "eckit/os/SignalHandler.h"
 #include "eckit/runtime/Monitor.h"
 #include "eckit/utils/Tokenizer.h"
+#include "eckit/value/Value.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <exception>
+#include <fstream>
+#include <iomanip>
+#include <unistd.h>
+#include <utility>
 
 // TODO: remember to add a mutex