From 714e0293e3e83dc5df0e722070489acdc8c33718 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Mon, 23 May 2022 11:49:12 +0000 Subject: [PATCH] - fixed includes after refactor - fixed mutual inclusions git-svn-id: http://moon:8086/svn/software/trunk/libsrc/radio@866 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- RealVector.hpp | 6 +++--- RealVector2.hpp | 6 +++--- radio.h | 6 +++--- real.h | 6 +++--- ringbuf.h | 6 +++--- statistics.h | 6 +++--- symbol.h | 6 +++--- synchronization.h | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/RealVector.hpp b/RealVector.hpp index 327463f..e2c7ffa 100755 --- a/RealVector.hpp +++ b/RealVector.hpp @@ -1,5 +1,5 @@ -#ifndef _REAL_HPP_ -#define _REAL_HPP_ +#ifndef _RADIO_REALVECTOR_HPP_ +#define _RADIO_REALVECTOR_HPP_ #include #include @@ -231,4 +231,4 @@ RealVector::OpBinary operator-(const RealVector &a, const RealV RealVector::OpBinary operator*(const RealVector &a, const RealVector &b); RealVector::OpBinary operator/(const RealVector &a, const RealVector &b); -#endif // _REAL_HPP_ +#endif // _RADIO_REALVECTOR_HPP_ diff --git a/RealVector2.hpp b/RealVector2.hpp index 04e4451..b85fb0f 100755 --- a/RealVector2.hpp +++ b/RealVector2.hpp @@ -1,5 +1,5 @@ -#ifndef _REAL_HPP_ -#define _REAL_HPP_ +#ifndef _RADIO_REALVECTOR2_HPP_ +#define _RADIO_REALVECTOR2_HPP_ #include #include @@ -268,4 +268,4 @@ RealVector::OpBinary operator-(const RealVector &a, const RealVector &b); RealVector::OpBinary operator*(const RealVector &a, const RealVector &b); RealVector::OpBinary operator/(const RealVector &a, const RealVector &b); -#endif // _REAL_HPP_ \ No newline at end of file +#endif // _RADIO_REALVECTOR2_HPP_ \ No newline at end of file diff --git a/radio.h b/radio.h index 713d0b9..cf94e05 100755 --- a/radio.h +++ b/radio.h @@ -1,6 +1,6 @@ // -------------------------------------------------------------- -#ifndef RADIO_H -#define RADIO_H +#ifndef _RADIO_RADIO_H_ +#define _RADIO_RADIO_H_ #include "radio_types.h" @@ -527,4 +527,4 @@ uint32_t FrameSymbolsDemap(cpx_t *pSym, uint8_t *pBits, uint32_t nBitsPerSym, ui #endif // -------------------------------------------------------------- -#endif // RADIO_H +#endif // _RADIO_RADIO_H_ diff --git a/real.h b/real.h index 66449af..8385714 100755 --- a/real.h +++ b/real.h @@ -1,6 +1,6 @@ // -------------------------------------------------------------- -#ifndef REAL_H -#define REAL_H +#ifndef _RADIO_REAL_H_ +#define _RADIO_REAL_H_ #include "radio_types.h" @@ -28,4 +28,4 @@ radio_float_t dpow(radio_float_t base, radio_float_t exp); #endif // __cplusplus // -------------------------------------------------------------- -#endif // REAL_H +#endif // _RADIO_REAL_H_ diff --git a/ringbuf.h b/ringbuf.h index f662130..1037f3f 100755 --- a/ringbuf.h +++ b/ringbuf.h @@ -1,6 +1,6 @@ // -------------------------------------------------------------- -#ifndef RINGBUF_H -#define RINGBUF_H +#ifndef _RADIO_RINGBUF_H_ +#define _RADIO_RINGBUF_H_ #include #include "radio_types.h" @@ -59,4 +59,4 @@ void FifoPopFront(fifo_t *pObj); #endif // __cplusplus // -------------------------------------------------------------- -#endif // RINGBUF_H +#endif // _RADIO_RINGBUF_H_ diff --git a/statistics.h b/statistics.h index a625d18..c52ad48 100755 --- a/statistics.h +++ b/statistics.h @@ -1,6 +1,6 @@ // -------------------------------------------------------------- -#ifndef STATISTICS_H -#define STATISTICS_H +#ifndef _RADIO_STATISTICS_H_ +#define _RADIO_STATISTICS_H_ #include // Trace() #include // Trace() @@ -91,4 +91,4 @@ void TracePrint(trace_t *pObj, const char *fmt, ... ); #endif // __cplusplus // -------------------------------------------------------------- -#endif // STATISTICS_H +#endif // _RADIO_STATISTICS_H_ diff --git a/symbol.h b/symbol.h index 4a63e14..aef8b9e 100755 --- a/symbol.h +++ b/symbol.h @@ -1,6 +1,6 @@ // -------------------------------------------------------------- -#ifndef SYMBOL_H -#define SYMBOL_H +#ifndef _RADIO_SYMBOL_H_ +#define _RADIO_SYMBOL_H_ #include "radio_types.h" #include "statistics.h" @@ -80,4 +80,4 @@ sym_err_t SymMapGetError(sym_map_t *pObj, cpx_t x, symbol_t symbol); #endif // __cplusplus // -------------------------------------------------------------- -#endif // SYMBOL_H +#endif // _RADIO_SYMBOL_H_ diff --git a/synchronization.h b/synchronization.h index d7164bd..0cc1655 100755 --- a/synchronization.h +++ b/synchronization.h @@ -1,6 +1,6 @@ // -------------------------------------------------------------- -#ifndef SYNCHRONIZATION_H -#define SYNCHRONIZATION_H +#ifndef _RADIO_SYNCHRONIZATION_H_ +#define _RADIO_SYNCHRONIZATION_H_ #include "radio_types.h" #include "nco.h" @@ -90,4 +90,4 @@ uint32_t TimingCorrectorIsStuff(timing_corrector_t *pObj); #endif // __cplusplus // -------------------------------------------------------------- -#endif // SYNCHRONIZATION_H +#endif // _RADIO_SYNCHRONIZATION_H_