diff options
| author | Andrew Jeffery <andrew@aj.id.au> | 2019-03-14 09:57:28 +1030 |
|---|---|---|
| committer | Andrew Jeffery <andrew@aj.id.au> | 2019-03-15 22:38:43 +1030 |
| commit | 261f61a1747a9ebf092d4f426e891ff94ad33ffc (patch) | |
| tree | 218beb17e6deb8594b1278ccfd14446dcc7df645 /vpnor/test/create_read_window_remap.cpp | |
| parent | 8e1d5dda93130819e26ee718375e43936c971781 (diff) | |
| download | phosphor-mboxbridge-261f61a1747a9ebf092d4f426e891ff94ad33ffc.tar.gz phosphor-mboxbridge-261f61a1747a9ebf092d4f426e891ff94ad33ffc.zip | |
vpnor: Shuffle and rework includes for sanity
Include ordering and whether or not C linkage is forced by `extern "C"`
blocks can cause headaches at link time. Ensure that all C dependencies
are included in an `extern C` block before other includes occur. Also
include the C++ versions of string.h and assert.h
Change-Id: Ia96f6044d40c8eccb907b65924efcf62ac7a89c3
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Diffstat (limited to 'vpnor/test/create_read_window_remap.cpp')
| -rw-r--r-- | vpnor/test/create_read_window_remap.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/vpnor/test/create_read_window_remap.cpp b/vpnor/test/create_read_window_remap.cpp index c05ef02..7a11053 100644 --- a/vpnor/test/create_read_window_remap.cpp +++ b/vpnor/test/create_read_window_remap.cpp @@ -3,15 +3,6 @@ #include "config.h" -#include <assert.h> -#include <string.h> - -#include <experimental/filesystem> -#include <fstream> -#include <vector> - -#include "vpnor/mboxd_pnor_partition_table.h" - extern "C" { #include "test/mbox.h" #include "test/system.h" @@ -19,6 +10,14 @@ extern "C" { #include "vpnor/test/tmpd.hpp" +#include <cassert> +#include <cstring> +#include <experimental/filesystem> +#include <fstream> +#include <vector> + +#include "vpnor/mboxd_pnor_partition_table.h" + static const auto BLOCK_SIZE = 4096; static const auto ERASE_SIZE = BLOCK_SIZE; static const auto WINDOW_SIZE = 16 * BLOCK_SIZE; |
