From 6cc757f769ba72261860f5bd3f47e1cc197124a3 Mon Sep 17 00:00:00 2001 From: Christoph Bachhuber Date: Sat, 18 Jan 2020 17:58:02 +0100 Subject: [PATCH] Fix includes in examples (#407) * Fix includes in examples * Fix order * Align with other subcommand files Co-authored-by: Henry Schreiner --- examples/callback_passthrough.cpp | 4 +++- examples/enum.cpp | 2 ++ examples/enum_ostream.cpp | 3 +++ examples/formatter.cpp | 2 ++ examples/groups.cpp | 6 ++++-- examples/json.cpp | 4 ++++ examples/modhelp.cpp | 5 ++--- examples/option_groups.cpp | 4 +++- examples/positional_arity.cpp | 4 +++- examples/positional_validation.cpp | 4 +++- examples/prefix_command.cpp | 5 ++++- examples/ranges.cpp | 4 +++- examples/retired.cpp | 4 +++- examples/shapes.cpp | 4 +++- examples/simple.cpp | 4 +++- examples/subcom_help.cpp | 1 + examples/subcom_in_files/subcommand_a.cpp | 6 ++---- examples/subcom_in_files/subcommand_a.hpp | 6 +----- examples/subcom_in_files/subcommand_main.cpp | 5 +---- examples/subcom_partitioned.cpp | 7 +++++-- examples/subcommands.cpp | 4 +++- examples/validators.cpp | 4 +++- 22 files changed, 61 insertions(+), 31 deletions(-) diff --git a/examples/callback_passthrough.cpp b/examples/callback_passthrough.cpp index 8d0203b1..8e741f24 100644 --- a/examples/callback_passthrough.cpp +++ b/examples/callback_passthrough.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include int main(int argc, char **argv) { diff --git a/examples/enum.cpp b/examples/enum.cpp index a5f84f98..7faf7ba2 100644 --- a/examples/enum.cpp +++ b/examples/enum.cpp @@ -1,5 +1,7 @@ #include +#include #include +#include enum class Level : int { High, Medium, Low }; diff --git a/examples/enum_ostream.cpp b/examples/enum_ostream.cpp index 62bc6971..652f233c 100644 --- a/examples/enum_ostream.cpp +++ b/examples/enum_ostream.cpp @@ -1,4 +1,7 @@ #include +#include +#include +#include enum class Level : int { High, Medium, Low }; diff --git a/examples/formatter.cpp b/examples/formatter.cpp index 4d67ec61..277dec03 100644 --- a/examples/formatter.cpp +++ b/examples/formatter.cpp @@ -1,4 +1,6 @@ #include +#include +#include class MyFormatter : public CLI::Formatter { public: diff --git a/examples/groups.cpp b/examples/groups.cpp index f8de448f..772696f5 100644 --- a/examples/groups.cpp +++ b/examples/groups.cpp @@ -1,5 +1,7 @@ -#include "CLI/CLI.hpp" -#include "CLI/Timer.hpp" +#include +#include +#include +#include int main(int argc, char **argv) { CLI::AutoTimer("This is a timer"); diff --git a/examples/json.cpp b/examples/json.cpp index b4c8101a..f633b1db 100644 --- a/examples/json.cpp +++ b/examples/json.cpp @@ -1,5 +1,9 @@ #include +#include +#include #include +#include +#include // This example is only built on GCC 7 on Travis due to mismatch in stdlib // for clang (CLI11 is forgiving about mismatches, json.hpp is not) diff --git a/examples/modhelp.cpp b/examples/modhelp.cpp index a2568322..b5b6ac1b 100644 --- a/examples/modhelp.cpp +++ b/examples/modhelp.cpp @@ -1,7 +1,6 @@ - -#include "CLI/CLI.hpp" - +#include #include +#include int main(int argc, char **argv) { CLI::App test{R"raw(Modify the help print so that argument values are accessible. diff --git a/examples/option_groups.cpp b/examples/option_groups.cpp index e3cf3013..0956d61a 100644 --- a/examples/option_groups.cpp +++ b/examples/option_groups.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include int main(int argc, char **argv) { diff --git a/examples/positional_arity.cpp b/examples/positional_arity.cpp index a0340ec2..48d9a43a 100644 --- a/examples/positional_arity.cpp +++ b/examples/positional_arity.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include int main(int argc, char **argv) { diff --git a/examples/positional_validation.cpp b/examples/positional_validation.cpp index 63ff498c..fa7e8ae9 100644 --- a/examples/positional_validation.cpp +++ b/examples/positional_validation.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include int main(int argc, char **argv) { diff --git a/examples/prefix_command.cpp b/examples/prefix_command.cpp index edd7a0d6..52155d55 100644 --- a/examples/prefix_command.cpp +++ b/examples/prefix_command.cpp @@ -1,4 +1,7 @@ -#include "CLI/CLI.hpp" +#include +#include +#include +#include int main(int argc, char **argv) { diff --git a/examples/ranges.cpp b/examples/ranges.cpp index ace778fb..dc3d40ef 100644 --- a/examples/ranges.cpp +++ b/examples/ranges.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include int main(int argc, char **argv) { diff --git a/examples/retired.cpp b/examples/retired.cpp index 6c205309..dfa650b8 100644 --- a/examples/retired.cpp +++ b/examples/retired.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include #include // This example shows the usage of the retired and deprecated option helper methods diff --git a/examples/shapes.cpp b/examples/shapes.cpp index 1fcf7696..c0b0f768 100644 --- a/examples/shapes.cpp +++ b/examples/shapes.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include int main(int argc, char **argv) { diff --git a/examples/simple.cpp b/examples/simple.cpp index d1ae4716..3ba6f8e4 100644 --- a/examples/simple.cpp +++ b/examples/simple.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include int main(int argc, char **argv) { diff --git a/examples/subcom_help.cpp b/examples/subcom_help.cpp index 0d8997d9..b2d20196 100644 --- a/examples/subcom_help.cpp +++ b/examples/subcom_help.cpp @@ -1,5 +1,6 @@ #include #include +#include int main(int argc, char *argv[]) { CLI::App cli_global{"Demo app"}; diff --git a/examples/subcom_in_files/subcommand_a.cpp b/examples/subcom_in_files/subcommand_a.cpp index affc6e84..697b9e08 100644 --- a/examples/subcom_in_files/subcommand_a.cpp +++ b/examples/subcom_in_files/subcommand_a.cpp @@ -1,8 +1,6 @@ -// =================================================================== -// subcommand_a.cpp -// =================================================================== - #include "subcommand_a.hpp" +#include +#include /// Set up a subcommand and capture a shared_ptr to a struct that holds all its options. /// The variables of the struct are bound to the CLI options. diff --git a/examples/subcom_in_files/subcommand_a.hpp b/examples/subcom_in_files/subcommand_a.hpp index f05d6bf6..b6660b12 100644 --- a/examples/subcom_in_files/subcommand_a.hpp +++ b/examples/subcom_in_files/subcommand_a.hpp @@ -1,10 +1,6 @@ #pragma once -// =================================================================== -// subcommand_a.hpp -// =================================================================== -#include "CLI/CLI.hpp" -#include +#include #include /// Collection of all options of Subcommand A. diff --git a/examples/subcom_in_files/subcommand_main.cpp b/examples/subcom_in_files/subcommand_main.cpp index 3befa7a9..7fb6c8d0 100644 --- a/examples/subcom_in_files/subcommand_main.cpp +++ b/examples/subcom_in_files/subcommand_main.cpp @@ -1,8 +1,5 @@ -// =================================================================== -// main.cpp -// =================================================================== - #include "subcommand_a.hpp" +#include int main(int argc, char **argv) { CLI::App app{"..."}; diff --git a/examples/subcom_partitioned.cpp b/examples/subcom_partitioned.cpp index d3afdc59..d2a36063 100644 --- a/examples/subcom_partitioned.cpp +++ b/examples/subcom_partitioned.cpp @@ -1,5 +1,8 @@ -#include "CLI/CLI.hpp" -#include "CLI/Timer.hpp" +#include +#include +#include +#include +#include int main(int argc, char **argv) { CLI::AutoTimer("This is a timer"); diff --git a/examples/subcommands.cpp b/examples/subcommands.cpp index 580f4d1a..61bdcea6 100644 --- a/examples/subcommands.cpp +++ b/examples/subcommands.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include int main(int argc, char **argv) { diff --git a/examples/validators.cpp b/examples/validators.cpp index d431ed22..35e948ba 100644 --- a/examples/validators.cpp +++ b/examples/validators.cpp @@ -1,4 +1,6 @@ -#include "CLI/CLI.hpp" +#include +#include +#include int main(int argc, char **argv) {