fly/flightgear
1
0
Fork 0
Code Activity

(Try to) Prevent a one or more multiply defined symbols found error

Browse source
This commit is contained in:
Erik Hofman 2021-03-07 15:59:25 +01:00
parent 4ca929fa61
commit 0480bb15a9
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Network/native_ctrls.hxx
View file

@ -34,7 +34,7 @@
#if FG_HAVE_DDS #if FG_HAVE_DDS
#include "DDS/dds_ctrls.h" #include "DDS/dds_ctrls.h"
#else #else
using FG_DDS_Ctrls = int; using FG_DDS_Ctrls = FGNetCtrls;
#endif #endif
using std::string; using std::string;
@ -66,11 +66,11 @@ public:
// Populate the FGNetCtrls/FG_DDS_Ctrls structure from the property tree. // Populate the FGNetCtrls/FG_DDS_Ctrls structure from the property tree.
template<typename T> template<typename T>
void FGProps2Ctrls( T *net, bool honor_freezes, bool net_byte_order ) {}; void FGProps2Ctrls( T *net, bool honor_freezes, bool net_byte_order );
// Update the property tree from the FGNetCtrls/FG_DDS_Ctrls structure. // Update the property tree from the FGNetCtrls/FG_DDS_Ctrls structure.
template<typename T> template<typename T>
void FGCtrls2Props( T *net, bool honor_freezes, bool net_byte_order ) {}; void FGCtrls2Props( T *net, bool honor_freezes, bool net_byte_order );
#endif // _FG_NATIVE_CTRLS_HXX #endif // _FG_NATIVE_CTRLS_HXX

6
src/Network/native_fdm.hxx
View file

@ -34,7 +34,7 @@
#if FG_HAVE_DDS #if FG_HAVE_DDS
#include "DDS/dds_fdm.h" #include "DDS/dds_fdm.h"
#else #else
using FG_DDS_FDM = int; using FG_DDS_FDM = FGNetFDM;
#endif #endif
@ -65,11 +65,11 @@ public:
// Populate the FGNetFDM/FG_DDS_FDM structure from the property tree. // Populate the FGNetFDM/FG_DDS_FDM structure from the property tree.
template<typename T> template<typename T>
void FGProps2FDM( T *net, bool net_byte_order = true ) {}; void FGProps2FDM( T *net, bool net_byte_order = true );
// Update the property tree from the FGNetFDM/FG_DDS_FDM structure. // Update the property tree from the FGNetFDM/FG_DDS_FDM structure.
template<typename T> template<typename T>
void FGFDM2Props( T *net, bool net_byte_order = true ) {}; void FGFDM2Props( T *net, bool net_byte_order = true );
#endif // _FG_NATIVE_FDM_HXX #endif // _FG_NATIVE_FDM_HXX

6
src/Network/native_gui.hxx
View file

@ -32,7 +32,7 @@
#if FG_HAVE_DDS #if FG_HAVE_DDS
#include "DDS/dds_gui.h" #include "DDS/dds_gui.h"
#else #else
using FG_DDS_GUI = int; using FG_DDS_GUI = FGNetGUI;
#endif #endif
class FGNativeGUI : public FGProtocol { class FGNativeGUI : public FGProtocol {
@ -62,11 +62,11 @@ public:
// Populate the FGNetGUI/FG_DDS_GUI structure from the property tree. // Populate the FGNetGUI/FG_DDS_GUI structure from the property tree.
template<typename T> template<typename T>
void FGProps2GUI( T *net ) {}; void FGProps2GUI( T *net );
// Update the property tree from the FGNetGUI/FG_DDS_GUI structure. // Update the property tree from the FGNetGUI/FG_DDS_GUI structure.
template<typename T> template<typename T>
void FGGUI2Props( T *net ) {}; void FGGUI2Props( T *net );
#endif // _FG_NATIVE_GUI_HXX #endif // _FG_NATIVE_GUI_HXX