From ac6ae7b24d4242335573ab28a0058356ffa29150 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 7 Dec 2020 16:04:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- cmake/etc/uncrustify | 2 +- src/myx/backports/cpp/span.hpp | 13 ---- src/myx/core/endian_types.hpp | 81 ++++++++++++------------ src/myx/core/enum_bitmask_operations.hpp | 10 +-- src/myx/filesystem/paths.hpp | 1 - 6 files changed, 46 insertions(+), 63 deletions(-) diff --git a/cmake/cmlib b/cmake/cmlib index 0e96514..f5151f5 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 0e9651441369ae6984f728b9df14dbc2fa41aa58 +Subproject commit f5151f5a2b102b75486c72df8d0dddd842ed0bbc diff --git a/cmake/etc/uncrustify b/cmake/etc/uncrustify index b05da4d..69fc1a4 160000 --- a/cmake/etc/uncrustify +++ b/cmake/etc/uncrustify @@ -1 +1 @@ -Subproject commit b05da4d52a0379c9ca9c06fd7898641268624238 +Subproject commit 69fc1a43dfa7336d5878b0b28a0b9c0e07bf740e diff --git a/src/myx/backports/cpp/span.hpp b/src/myx/backports/cpp/span.hpp index ac09b51..6400671 100644 --- a/src/myx/backports/cpp/span.hpp +++ b/src/myx/backports/cpp/span.hpp @@ -105,7 +105,6 @@ public: { } - /** Constructor * @param container The container to construct from */ @@ -121,7 +120,6 @@ public: { } - template< class CharT, class Traits, class Allocator > explicit span( std::basic_string< CharT, Traits, Allocator >& s ) : @@ -130,7 +128,6 @@ public: { } - template< class CharT, class Traits, class Allocator > explicit span( std::basic_string< CharT, Traits, Allocator > const& s ) : @@ -139,7 +136,6 @@ public: { } - /** Assignment * @param container The container to assign from */ @@ -154,7 +150,6 @@ public: return( *this ); } - template< class CharT, class Traits, class Allocator > span& operator=( std::basic_string< @@ -165,7 +160,6 @@ public: return( *this ); } - template< class CharT, class Traits, class Allocator > span& operator=( std::basic_string< @@ -176,7 +170,6 @@ public: return( *this ); } - /// Returns `true` if the span is empty bool empty() const @@ -184,7 +177,6 @@ public: return( m_size == 0 ); } - /// Returns a pointer to the beginning of the span T* data() const @@ -192,7 +184,6 @@ public: return( m_data ); } - /// Returns the number of elements in the span std::size_t size() const @@ -200,7 +191,6 @@ public: return( m_size ); } - /// Returns an iterator to the beginning of the span Iterator begin() const @@ -208,7 +198,6 @@ public: return( m_data ); } - /// Returns an iterator to the beginning of the span ConstIterator cbegin() const @@ -216,7 +205,6 @@ public: return( m_data ); } - /// Returns an iterator to one past the end of the span Iterator end() const @@ -224,7 +212,6 @@ public: return( m_data + m_size ); } - /// Returns an iterator to one past the end of the span ConstIterator cend() const diff --git a/src/myx/core/endian_types.hpp b/src/myx/core/endian_types.hpp index a76747a..9e93fb4 100644 --- a/src/myx/core/endian_types.hpp +++ b/src/myx/core/endian_types.hpp @@ -23,7 +23,7 @@ template< typename T > class EndianTypesBase { protected: - #if defined ( _MSC_VER ) + #if defined( _MSC_VER ) #pragma warning ( push ) #endif static T swapBytes( const T& b ) @@ -35,7 +35,6 @@ protected: return( n ); } // swapBytes - #if defined( _MSC_VER ) #pragma warning ( pop ) #endif @@ -53,7 +52,6 @@ protected: return( ( reinterpret_cast< const char& >( k_i ) == 1 ) ? b : EndianTypesBase< T >::swapBytes( b ) ); //NOLINT } - public: // Constructors LittleEndianType() = default; @@ -73,31 +71,31 @@ public: template < typename U > explicit operator U() const { return( U( transform( m_data ) ) ); } explicit operator T() const { return( transform( m_data ) ); } - template < typename U > bool operator ==( U const& o ) { return( U( *this ) == o ); } - template < typename U > bool operator !=( U const& o ) { return( U( *this ) != o ); } + template < typename U > bool operator==( U const& o ) { return( U( *this ) == o ); } + template < typename U > bool operator!=( U const& o ) { return( U( *this ) != o ); } // Arithmetic assignment operators - LittleEndianType& operator ++() /* prefix */ { *this = T( *this ) + T( 1 ); return( *this ); } - LittleEndianType operator ++( int ) /* suffix */ { LittleEndianType t( *this ); *this = T( *this ) + T( 1 ); return( t ); } - LittleEndianType& operator --() /* prefix */ { *this = T( *this ) - T( 1 ); return( *this ); } - LittleEndianType operator --( int ) /* suffix */ { LittleEndianType t( *this ); *this = T( *this ) - T( 1 ); return( t ); } + LittleEndianType& operator++() /* prefix */ { *this = T( *this ) + T( 1 ); return( *this ); } + LittleEndianType operator++( int ) /* suffix */ { LittleEndianType t( *this ); *this = T( *this ) + T( 1 ); return( t ); } + LittleEndianType& operator--() /* prefix */ { *this = T( *this ) - T( 1 ); return( *this ); } + LittleEndianType operator--( int ) /* suffix */ { LittleEndianType t( *this ); *this = T( *this ) - T( 1 ); return( t ); } // Compound assignment operators - LittleEndianType& operator +=( const T& b ) { *this = T( *this ) + b; return( *this ); } - LittleEndianType& operator -=( const T& b ) { *this = T( *this ) - b; return( *this ); } - LittleEndianType& operator *=( const T& b ) { *this = T( *this ) * b; return( *this ); } - LittleEndianType& operator /=( const T& b ) { *this = T( *this ) / b; return( *this ); } - LittleEndianType& operator %=( const T& b ) { *this = T( *this ) % b; return( *this ); } - LittleEndianType& operator &=( const T& b ) { *this = T( *this ) & b; return( *this ); } - LittleEndianType& operator |=( const T& b ) { *this = T( *this ) | b; return( *this ); } - LittleEndianType& operator ^=( const T& b ) { *this = T( *this ) ^ b; return( *this ); } - LittleEndianType& operator <<=( const T& b ) { *this = T( T( *this ) << b ); return( *this ); } - LittleEndianType& operator >>=( const T& b ) { *this = T( T( *this ) >> b ); return( *this ); } - friend std::ostream& operator <<( std::ostream& out, const LittleEndianType b ) { out << T( b ); return( out ); } - friend std::istream& operator >>( std::istream& in, LittleEndianType& b ) { T val; in >> val; b = val; return( in ); } + LittleEndianType& operator+=( const T& b ) { *this = T( *this ) + b; return( *this ); } + LittleEndianType& operator-=( const T& b ) { *this = T( *this ) - b; return( *this ); } + LittleEndianType& operator*=( const T& b ) { *this = T( *this ) * b; return( *this ); } + LittleEndianType& operator/=( const T& b ) { *this = T( *this ) / b; return( *this ); } + LittleEndianType& operator%=( const T& b ) { *this = T( *this ) % b; return( *this ); } + LittleEndianType& operator&=( const T& b ) { *this = T( *this ) & b; return( *this ); } + LittleEndianType& operator|=( const T& b ) { *this = T( *this ) | b; return( *this ); } + LittleEndianType& operator^=( const T& b ) { *this = T( *this ) ^ b; return( *this ); } + LittleEndianType& operator<<=( const T& b ) { *this = T( T( *this ) << b ); return( *this ); } + LittleEndianType& operator>>=( const T& b ) { *this = T( T( *this ) >> b ); return( *this ); } + friend std::ostream& operator<<( std::ostream& out, const LittleEndianType b ) { out << T( b ); return( out ); } + friend std::istream& operator>>( std::istream& in, LittleEndianType& b ) { T val; in >> val; b = val; return( in ); } std::string toStdString() { return( std::to_string( transform( m_data ) ) ); } #ifdef QT_CORE_LIB - friend QDebug& operator <<( QDebug& out, const LittleEndianType< T > b ) { out << T( b ); return( out ); } + friend QDebug& operator<<( QDebug& out, const LittleEndianType< T > b ) { out << T( b ); return( out ); } QString toQString() { return( QString::number( transform( m_data ) ) ); } #endif }; // class LittleEndianType @@ -114,7 +112,6 @@ protected: return( ( reinterpret_cast< const char& >( k_i ) == 1 ) ? EndianTypesBase< T >::swapBytes( b ) : b ); //NOLINT } - public: // Constructors BigEndianType() = default; @@ -134,31 +131,31 @@ public: template < typename U > explicit operator U() const { return( U( transform( m_data ) ) ); } explicit operator T() const { return( transform( m_data ) ); } - template < typename U > bool operator ==( U const& o ) { return( U( *this ) == o ); } - template < typename U > bool operator !=( U const& o ) { return( U( *this ) != o ); } + template < typename U > bool operator==( U const& o ) { return( U( *this ) == o ); } + template < typename U > bool operator!=( U const& o ) { return( U( *this ) != o ); } // Arithmetic assignment operators - BigEndianType& operator ++() /* prefix */ { *this = T( *this ) + 1; return( *this ); } - BigEndianType operator ++( int ) /* suffix */ { BigEndianType t( *this ); *this = T( *this ) + 1; return( t ); } - BigEndianType& operator --() /* prefix */ { *this = T( *this ) - 1; return( *this ); } - BigEndianType operator --( int ) /* suffix */ { BigEndianType t( *this ); *this = T( *this ) - 1; return( t ); } + BigEndianType& operator++() /* prefix */ { *this = T( *this ) + 1; return( *this ); } + BigEndianType operator++( int ) /* suffix */ { BigEndianType t( *this ); *this = T( *this ) + 1; return( t ); } + BigEndianType& operator--() /* prefix */ { *this = T( *this ) - 1; return( *this ); } + BigEndianType operator--( int ) /* suffix */ { BigEndianType t( *this ); *this = T( *this ) - 1; return( t ); } // Compound assignment operators - BigEndianType& operator +=( const T& b ) { *this = T( *this ) + b; return( *this ); } - BigEndianType& operator -=( const T& b ) { *this = T( *this ) - b; return( *this ); } - BigEndianType& operator *=( const T& b ) { *this = T( *this ) * b; return( *this ); } - BigEndianType& operator /=( const T& b ) { *this = T( *this ) / b; return( *this ); } - BigEndianType& operator %=( const T& b ) { *this = T( *this ) % b; return( *this ); } - BigEndianType& operator &=( const T& b ) { *this = T( *this ) & b; return( *this ); } - BigEndianType& operator |=( const T& b ) { *this = T( *this ) | b; return( *this ); } - BigEndianType& operator ^=( const T& b ) { *this = T( *this ) ^ b; return( *this ); } - BigEndianType& operator <<=( const T& b ) { *this = T( T( *this ) << b ); return( *this ); } - BigEndianType& operator >>=( const T& b ) { *this = T( T( *this ) >> b ); return( *this ); } - friend std::ostream& operator <<( std::ostream& out, const BigEndianType b ) { out << T( b ); return( out ); } - friend std::istream& operator >>( std::istream& in, BigEndianType& b ) { T val; in >> val; b = val; return( in ); } + BigEndianType& operator+=( const T& b ) { *this = T( *this ) + b; return( *this ); } + BigEndianType& operator-=( const T& b ) { *this = T( *this ) - b; return( *this ); } + BigEndianType& operator*=( const T& b ) { *this = T( *this ) * b; return( *this ); } + BigEndianType& operator/=( const T& b ) { *this = T( *this ) / b; return( *this ); } + BigEndianType& operator%=( const T& b ) { *this = T( *this ) % b; return( *this ); } + BigEndianType& operator&=( const T& b ) { *this = T( *this ) & b; return( *this ); } + BigEndianType& operator|=( const T& b ) { *this = T( *this ) | b; return( *this ); } + BigEndianType& operator^=( const T& b ) { *this = T( *this ) ^ b; return( *this ); } + BigEndianType& operator<<=( const T& b ) { *this = T( T( *this ) << b ); return( *this ); } + BigEndianType& operator>>=( const T& b ) { *this = T( T( *this ) >> b ); return( *this ); } + friend std::ostream& operator<<( std::ostream& out, const BigEndianType b ) { out << T( b ); return( out ); } + friend std::istream& operator>>( std::istream& in, BigEndianType& b ) { T val; in >> val; b = val; return( in ); } std::string toStdString() { return( std::to_string( transform( m_data ) ) ); } #ifdef QT_CORE_LIB - friend QDebug& operator <<( QDebug& out, const BigEndianType< T > b ) { out << T( b ); return( out ); } + friend QDebug& operator<<( QDebug& out, const BigEndianType< T > b ) { out << T( b ); return( out ); } QString toQString() { return( QString::number( transform( m_data ) ) ); } #endif }; // class BigEndianType diff --git a/src/myx/core/enum_bitmask_operations.hpp b/src/myx/core/enum_bitmask_operations.hpp index 1c10f8c..2a90540 100644 --- a/src/myx/core/enum_bitmask_operations.hpp +++ b/src/myx/core/enum_bitmask_operations.hpp @@ -17,7 +17,7 @@ struct EnableBitMaskOperators template< typename Enum > typename std::enable_if< EnableBitMaskOperators< Enum >::kEnable, Enum >::type -operator ~( Enum e ) +operator~( Enum e ) { using Underlying = typename std::underlying_type< Enum >::type; return( static_cast< Enum >( ~static_cast< Underlying >( e ) ) ); @@ -26,7 +26,7 @@ operator ~( Enum e ) template< typename Enum > typename std::enable_if< EnableBitMaskOperators< Enum >::kEnable, Enum >::type -operator |( Enum lhs, Enum rhs ) +operator|( Enum lhs, Enum rhs ) { using Underlying = typename std::underlying_type< Enum >::type; return( static_cast< Enum >( static_cast< Underlying >( lhs ) | static_cast< Underlying >( rhs ) ) ); @@ -35,7 +35,7 @@ operator |( Enum lhs, Enum rhs ) template< typename Enum > typename std::enable_if< EnableBitMaskOperators< Enum >::kEnable, typename std::add_lvalue_reference< Enum >::type >::type -operator |=( Enum& lhs, Enum rhs ) +operator|=( Enum& lhs, Enum rhs ) { using Underlying = typename std::underlying_type< Enum >::type; lhs = static_cast< Enum >( static_cast< Underlying >( lhs ) | static_cast< Underlying >( rhs ) ); @@ -45,7 +45,7 @@ operator |=( Enum& lhs, Enum rhs ) template< typename Enum > typename std::enable_if< EnableBitMaskOperators< Enum >::kEnable, Enum >::type -operator &( Enum lhs, Enum rhs ) +operator&( Enum lhs, Enum rhs ) { using Underlying = typename std::underlying_type< Enum >::type; return( static_cast< Enum >( static_cast< Underlying >( lhs ) & static_cast< Underlying >( rhs ) ) ); @@ -54,7 +54,7 @@ operator &( Enum lhs, Enum rhs ) template< typename Enum > typename std::enable_if< EnableBitMaskOperators< Enum >::kEnable, typename std::add_lvalue_reference< Enum >::type >::type -operator &=( Enum& lhs, Enum rhs ) +operator&=( Enum& lhs, Enum rhs ) { using Underlying = typename std::underlying_type< Enum >::type; lhs = static_cast< Enum >( static_cast< Underlying >( lhs ) & static_cast< Underlying >( rhs ) ); diff --git a/src/myx/filesystem/paths.hpp b/src/myx/filesystem/paths.hpp index 9baf284..4c62341 100644 --- a/src/myx/filesystem/paths.hpp +++ b/src/myx/filesystem/paths.hpp @@ -60,7 +60,6 @@ public: return( sPaths ); } - /** * @brief Обновление путей с учётом расположения исполняемого файла */