summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-03-17 07:33:00 +0100
committerRémi Verschelde <rverschelde@gmail.com>2020-03-17 07:36:24 +0100
commitcb282c6ef0bb91957f8a6f422705813bd47c788c (patch)
tree7eba92b08fc89f46f1b7402b86372cfcc82486db /main
parentc5d76139dc9c5721e09e0e782bed5ccf1789554b (diff)
Style: Set clang-format Standard to Cpp11
For us, it practically only changes the fact that `A<A<int>>` is now used instead of the C++03 compatible `A<A<int> >`. Note: clang-format 10+ changed the `Standard` arguments to fully specified `c++11`, `c++14`, etc. versions, but we can't use `c++17` now if we want to preserve compatibility with clang-format 8 and 9. `Cpp11` is still supported as deprecated alias for `Latest`.
Diffstat (limited to 'main')
-rw-r--r--main/input_default.h2
-rw-r--r--main/tests/test_ordered_hash_map.cpp4
-rw-r--r--main/tests/test_physics.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/main/input_default.h b/main/input_default.h
index 549093955d..0ec31d417b 100644
--- a/main/input_default.h
+++ b/main/input_default.h
@@ -183,7 +183,7 @@ private:
void _parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_emulated);
- List<Ref<InputEvent> > accumulated_events;
+ List<Ref<InputEvent>> accumulated_events;
bool use_accumulated_input;
public:
diff --git a/main/tests/test_ordered_hash_map.cpp b/main/tests/test_ordered_hash_map.cpp
index 4a74ad5898..cc779119bc 100644
--- a/main/tests/test_ordered_hash_map.cpp
+++ b/main/tests/test_ordered_hash_map.cpp
@@ -84,7 +84,7 @@ bool test_iteration() {
map.insert(123485, 1238888);
map.insert(123, 111111);
- Vector<Pair<int, int> > expected;
+ Vector<Pair<int, int>> expected;
expected.push_back(Pair<int, int>(42, 84));
expected.push_back(Pair<int, int>(123, 111111));
expected.push_back(Pair<int, int>(0, 12934));
@@ -101,7 +101,7 @@ bool test_iteration() {
}
bool test_const_iteration(const OrderedHashMap<int, int> &map) {
- Vector<Pair<int, int> > expected;
+ Vector<Pair<int, int>> expected;
expected.push_back(Pair<int, int>(42, 84));
expected.push_back(Pair<int, int>(123, 111111));
expected.push_back(Pair<int, int>(0, 12934));
diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp
index 0304e8f6dd..4931d42674 100644
--- a/main/tests/test_physics.cpp
+++ b/main/tests/test_physics.cpp
@@ -222,7 +222,7 @@ protected:
void make_grid(int p_width, int p_height, float p_cellsize, float p_cellheight, const Transform &p_xform = Transform()) {
- Vector<Vector<float> > grid;
+ Vector<Vector<float>> grid;
grid.resize(p_width);