f1x1t/myxlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Разные правки

Browse Source
This commit is contained in:
Andrei Astafev 2020-04-23 12:11:03 +03:00
parent 8d9a5590d7
commit cde0cf76a7
11 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/myx/base/config.cpp
View File

@ -2,4 +2,4 @@
#error Define MYXLIB_BUILD_LIBRARIES to compile this file.
#endif
#include "config.hpp"
#include <myx/base/config-inl.hpp>

11
src/myx/base/config.hpp
View File

@ -5,9 +5,20 @@
#ifdef MYXLIB_BUILD_LIBRARIES
#undef MYXLIB_HEADER_ONLY
#if defined( _WIN32 ) && defined( MYXLIB_SHARED_LIB )
#ifdef myxlib_EXPORTS
#define MYXLIB_API __declspec( dllexport )
#else
#define MYXLIB_API __declspec( dllimport )
#endif
#else
#define MYXLIB_API
#endif
#define MYXLIB_INLINE inline
#else
#define MYXLIB_HEADER_ONLY
#define MYXLIB_API
#define MYXLIB_INLINE inline
#endif

6
src/myx/math/almost_equal_relative-inl.hpp
View File

@ -14,7 +14,7 @@ namespace myx {
namespace math {
MYXLIB_INLINE bool almost_equal_relative( const float a, const float b,
const float maxRelDiff )
const float maxRelDiff )
{
float diff = fabsf( a - b );
float aN = fabsf( a );
@ -30,7 +30,7 @@ MYXLIB_INLINE bool almost_equal_relative( const float a, const float b,
MYXLIB_INLINE bool almost_equal_relative( const double a, const double b,
const double maxRelDiff )
const double maxRelDiff )
{
double diff = fabs( a - b );
double aN = fabs( a );
@ -48,4 +48,4 @@ MYXLIB_INLINE bool almost_equal_relative( const double a, const double b,
} // namespace myx
#endif
#endif // ifndef MYX_MATH_ALMOST_EQUAL_RELATIVE_INL_HPP_

6
src/myx/math/almost_equal_relative_and_abs-inl.hpp
View File

@ -14,7 +14,7 @@ namespace myx {
namespace math {
MYXLIB_INLINE bool almost_equal_relative_and_abs( const float a, const float b,
const float maxAbsDiff, const float maxRelDiff )
const float maxAbsDiff, const float maxRelDiff )
{
// Check if the numbers are really close -- needed
// when comparing numbers near zero.
@ -37,7 +37,7 @@ MYXLIB_INLINE bool almost_equal_relative_and_abs( const float a, const float b,
MYXLIB_INLINE bool almost_equal_relative_and_abs( const double a, const double b,
const double maxAbsDiff, const double maxRelDiff )
const double maxAbsDiff, const double maxRelDiff )
{
// Check if the numbers are really close -- needed
// when comparing numbers near zero.
@ -62,4 +62,4 @@ MYXLIB_INLINE bool almost_equal_relative_and_abs( const double a, const double b
} // namespace myx
#endif
#endif // ifndef MYX_MATH_ALMOST_EQUAL_RELATIVE_AND_ABS_INL_HPP_

6
src/myx/math/almost_equal_ulps-inl.hpp
View File

@ -16,7 +16,7 @@ namespace myx {
namespace math {
MYXLIB_INLINE bool almost_equal_ulps( const float a, const float b,
const int maxUlpsDiff )
const int maxUlpsDiff )
{
FloatCmp uA( a );
FloatCmp uB( b );
@ -52,7 +52,7 @@ MYXLIB_INLINE bool almost_equal_ulps( const float a, const float b,
MYXLIB_INLINE bool almost_equal_ulps( const double a, const double b,
const int maxUlpsDiff )
const int maxUlpsDiff )
{
DoubleCmp uA( a );
DoubleCmp uB( b );
@ -90,4 +90,4 @@ MYXLIB_INLINE bool almost_equal_ulps( const double a, const double b,
} // namespace myx
#endif
#endif // ifndef MYX_MATH_ALMOST_EQUAL_ULPS_INL_HPP_

6
src/myx/math/almost_equal_ulps_and_abs-inl.hpp
View File

@ -16,7 +16,7 @@ namespace myx {
namespace math {
MYXLIB_INLINE bool almost_equal_ulps_and_abs( const float a, const float b,
const float maxAbsDiff, const int maxUlpsDiff )
const float maxAbsDiff, const int maxUlpsDiff )
{
// Check if the numbers are really close -- needed
// when comparing numbers near zero.
@ -49,7 +49,7 @@ MYXLIB_INLINE bool almost_equal_ulps_and_abs( const float a, const float b,
MYXLIB_INLINE bool almost_equal_ulps_and_abs( const double a, const double b,
const double maxAbsDiff, const int maxUlpsDiff )
const double maxAbsDiff, const int maxUlpsDiff )
{
// Check if the numbers are really close -- needed
// when comparing numbers near zero.
@ -84,4 +84,4 @@ MYXLIB_INLINE bool almost_equal_ulps_and_abs( const double a, const double b,
} // namespace myx
#endif
#endif // ifndef MYX_MATH_ALMOST_EQUAL_ULPS_INL_HPP_

2
src/myx/math/constants-inl.hpp
View File

@ -15,4 +15,4 @@ namespace math {
} // namespace myx
#endif
#endif // ifndef MYX_MATH_CONSTANTS_INL_HPP_

2
src/myx/math/constants.hpp
View File

@ -12,7 +12,7 @@ namespace myx {
namespace math {
const auto ImpedanceOfFreeSpace = (M_PI * 119.9169832);
const auto ImpedanceOfFreeSpace = ( M_PI * 119.9169832 );
} // namespace math

2
src/myx/qt/CMakeLists.txt
View File

@ -3,10 +3,8 @@ set(TRGT qt)
# cmake-format: off
# Список файлов исходных текстов
if(NOT MYXLIB_HEADER_ONLY)
set(TRGT_cpp
${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp)
endif()
# Список заголовочных файлов (используется для установки)
set(TRGT_hpp

4
src/myx/qt/translators-inl.hpp
View File

@ -3,12 +3,12 @@
#pragma once
#include <myx/base/config.hpp>
#ifndef MYXLIB_HEADER_ONLY
#include <myx/qt/translators.hpp>
#endif
#include <myx/base/config.hpp>
#include <QCoreApplication>
#include <QLibraryInfo>
#include <QLocale>

2
src/myx/qt/translators.cpp
View File

@ -2,4 +2,4 @@
#error Define MYXLIB_BUILD_LIBRARIES to compile this file.
#endif
#include <myx/qt/translators.hpp>
#include <myx/qt/translators-inl.hpp>