Skip to content

Commit

Permalink
[src] Adapt for changes in GCC12
Browse files Browse the repository at this point in the history
  • Loading branch information
salkinium committed Jan 7, 2023
1 parent ee68da1 commit 73cbe24
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 0 deletions.
1 change: 1 addition & 0 deletions ext/gcc/cxxabi.cpp.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
extern "C"
{

void *__dso_handle = &__dso_handle;
void __cxa_pure_virtual()
{ modm_assert(0, "virt.pure", "A pure virtual function was called!"); }
void __cxa_deleted_virtual()
Expand Down
3 changes: 3 additions & 0 deletions src/modm/container/deque.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ namespace modm
removeFront();

public:
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
/**
* \brief Bidirectional const iterator
*
Expand Down Expand Up @@ -214,6 +216,7 @@ namespace modm

Size count;
};
#pragma GCC diagnostic pop

const_iterator
begin() const;
Expand Down
3 changes: 3 additions & 0 deletions src/modm/container/doubly_linked_list.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ namespace modm
Node *back;

public:
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
/**
* \brief Forward iterator
*
Expand Down Expand Up @@ -167,6 +169,7 @@ namespace modm

const Node* node;
};
#pragma GCC diagnostic pop

/**
* Returns a read/write iterator that points to the first element in the
Expand Down
3 changes: 3 additions & 0 deletions src/modm/container/dynamic_array.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ namespace modm
}

public:
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
/**
* \brief Forward iterator
*/
Expand Down Expand Up @@ -324,6 +326,7 @@ namespace modm
const DynamicArray *parent;
SizeType index;
};
#pragma GCC diagnostic pop

/**
* Returns a read/write iterator that points to the first element in the
Expand Down
3 changes: 3 additions & 0 deletions src/modm/container/linked_list.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ namespace modm
Node *back;

public:
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
/**
* \brief Forward iterator
*/
Expand Down Expand Up @@ -178,6 +180,7 @@ namespace modm
// a difference
Node* node;
};
#pragma GCC diagnostic pop

/**
* Returns a read/write iterator that points to the first element in the
Expand Down
1 change: 1 addition & 0 deletions src/modm/platform/can/common/can_bit_timings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <modm/math/units.hpp>
#include <modm/math/utils/misc.hpp>
#include <cmath>
#include <optional>

namespace modm
{
Expand Down
1 change: 1 addition & 0 deletions src/modm/platform/can/stm32-fdcan/message_ram.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <cstdint>
#include <concepts>
#include <span>
#include <tuple>

#include <modm/math/utils/bit_constants.hpp>
#include <modm/architecture/interface/register.hpp>
Expand Down
3 changes: 3 additions & 0 deletions src/modm/platform/core/cortex/linker.macros
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ MAIN_STACK_SIZE = {{ options[":platform:cortex-m:main_stack_size"] }};
*(.ARM.extab* .gnu.linkonce.armextab.*)
KEEP(*(.eh_frame*))
} >{{memory}}

/* required by libc __libc_fini_array, but never called */
_fini = .;
%% else
%#
/* C++ exception unwind tables are discarded */
Expand Down
1 change: 1 addition & 0 deletions src/modm/platform/dma/stm32/dma.hpp.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <cstdint>
#include <algorithm>
#include <array>
#include "../device.hpp"
#include "dma_hal.hpp"

Expand Down

0 comments on commit 73cbe24

Please sign in to comment.