Skip to content

fix multiple definition errors #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 5, 2025
Merged

fix multiple definition errors #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf5a8f0
fix: global vars in .h cause multiple definition errors
eigen-value Oct 27, 2025
6c4bc1f
Merge remote-tracking branch 'origin/main' into 24-move-constructor-t…
eigen-value Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/bridge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ class BridgeClassUpdater {
BridgeClassUpdater() = delete; // prevents instantiation
};

BridgeClass Bridge(Serial1);
inline BridgeClass Bridge(Serial1);

inline void updateEntryPoint(void *, void *, void *){
while (true) {
Expand All @@ -291,7 +291,7 @@ static void safeUpdate(){
}

// leave as is
void __loopHook(void){
void __attribute__((weak)) __loopHook(void){
k_yield();
safeUpdate();
}
Expand Down
2 changes: 1 addition & 1 deletion src/hci.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ template<size_t BufferSize=HCI_BUFFER_SIZE> class BridgeHCI {
extern BridgeClass Bridge;

namespace RouterBridge {
BridgeHCI<> HCI(Bridge);
inline BridgeHCI<> HCI(Bridge);
}

// Make available in global namespace for backward compatibility
Expand Down
3 changes: 2 additions & 1 deletion src/monitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ class BridgeMonitor: public Stream {
};

extern BridgeClass Bridge;
BridgeMonitor<> Monitor(Bridge);

inline BridgeMonitor<> Monitor(Bridge);

#endif // BRIDGE_MONITOR_H