Skip to content

Commit f7b07c6

Browse files
committed
Fixed include order and removed the filter from cpplint
1 parent 93a0aa0 commit f7b07c6

38 files changed

+121
-107
lines changed

CPPLINT.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
filter=-legal/copyright,-whitespace/braces,-whitespace/newline,-build/c++11,-whitespace/line_length,-whitespace/indent,-runtime/references,-whitespace/comments,-runtime/int,-build/header_guard,-whitespace/operators,-readability/braces,-readability/casting,-readability/todo
1+
filter=-legal/copyright,-whitespace/braces,-whitespace/newline,-build/c++11,-whitespace/line_length,-whitespace/indent,-runtime/references,-whitespace/comments,-runtime/int,-build/header_guard,-whitespace/operators,-readability/braces,-readability/casting,-readability/todo,-build/include_order

examples/applications/skew3-lcp.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@
1717
* http://www.boost.org/LICENSE_1_0.txt)
1818
**************************************************************************/
1919

20+
#include <cassert>
21+
#include <cmath>
22+
23+
#include <algorithm>
24+
#include <fstream>
25+
#include <iomanip>
26+
#include <iostream>
27+
#include <iterator>
28+
#include <limits>
29+
#include <numeric>
30+
#include <sstream>
31+
#include <string>
32+
#include <vector>
33+
2034
#include <foxxll/common/uint_types.hpp>
2135
#include <foxxll/common/utils.hpp>
2236
#include <foxxll/io.hpp>
@@ -29,18 +43,6 @@
2943
#include <stxxl/timer>
3044
#include <stxxl/vector>
3145

32-
#include <algorithm>
33-
#include <cassert>
34-
#include <cmath>
35-
#include <fstream>
36-
#include <iomanip>
37-
#include <iostream>
38-
#include <iterator>
39-
#include <limits>
40-
#include <numeric>
41-
#include <sstream>
42-
#include <string>
43-
#include <vector>
4446

4547
using foxxll::external_size_type;
4648

examples/applications/skew3.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,26 @@
1717
* http://www.boost.org/LICENSE_1_0.txt)
1818
**************************************************************************/
1919

20-
#include <foxxll/common/uint_types.hpp>
21-
#include <foxxll/io.hpp>
22-
#include <stxxl/algorithm>
23-
#include <stxxl/bits/common/cmdline.h>
24-
#include <stxxl/random>
25-
#include <stxxl/sorter>
26-
#include <stxxl/stream>
27-
#include <stxxl/vector>
28-
29-
#include <algorithm>
3020
#include <cassert>
3121
#include <cctype>
3222
#include <cstddef>
3323
#include <cstdlib>
24+
25+
#include <algorithm>
3426
#include <iostream>
3527
#include <limits>
3628
#include <string>
3729
#include <vector>
3830

31+
#include <foxxll/common/uint_types.hpp>
32+
#include <foxxll/io.hpp>
33+
#include <stxxl/algorithm>
34+
#include <stxxl/bits/common/cmdline.h>
35+
#include <stxxl/random>
36+
#include <stxxl/sorter>
37+
#include <stxxl/stream>
38+
#include <stxxl/vector>
39+
3940
using foxxll::external_size_type;
4041
namespace stream = stxxl::stream;
4142

examples/containers/sequence1.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
//! [example]
1414
#include <iostream>
15+
1516
#include <stxxl/sequence>
1617

1718
int main()

examples/containers/stack1.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
**************************************************************************/
1212

1313
//! [example]
14+
#include <cassert>
1415
#include <stxxl/stack>
1516

1617
int main()

examples/containers/unordered_map1.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
//! [example]
1515
#include <iostream>
16+
1617
#include <stxxl/unordered_map>
1718

1819
//! [hash]

examples/containers/vector1.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
//! [example]
1414
#include <iostream>
15+
1516
#include <stxxl/vector>
1617

1718
int main()

include/stxxl/bits/algo/ksort.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <foxxll/mng/block_manager.hpp>
3030
#include <foxxll/mng/block_prefetcher.hpp>
3131
#include <foxxll/mng/buf_writer.hpp>
32+
3233
#include <stxxl/bits/algo/bid_adapter.h>
3334
#include <stxxl/bits/algo/inmemsort.h>
3435
#include <stxxl/bits/algo/intksort.h>

include/stxxl/bits/algo/losertree.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#ifndef STXXL_ALGO_LOSERTREE_HEADER
1616
#define STXXL_ALGO_LOSERTREE_HEADER
1717

18+
#include <algorithm>
19+
1820
#include <foxxll/common/types.hpp>
1921
#include <foxxll/common/utils.hpp>
2022

@@ -24,8 +26,6 @@
2426
#include <stxxl/types>
2527
#include <tlx/math/integer_log2.hpp>
2628

27-
#include <algorithm>
28-
2929
namespace stxxl {
3030

3131
template <typename RunCursorType,

include/stxxl/bits/algo/run_cursor.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
#ifndef STXXL_ALGO_RUN_CURSOR_HEADER
1515
#define STXXL_ALGO_RUN_CURSOR_HEADER
1616

17+
#include <cassert>
18+
#include <cstdlib>
19+
1720
#include <tlx/define.hpp>
1821

1922
#include <foxxll/common/types.hpp>
2023

21-
#include <cassert>
22-
#include <cstdlib>
23-
2424
namespace stxxl {
2525

2626
template <typename BlockType>

0 commit comments

Comments
 (0)