From 9349b280cc3ddd48258e69510b27a0f4a6c60504 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Thu, 5 Nov 2020 01:32:50 +0100 Subject: [PATCH] Applied astyle formatting --- neo/idlib/math/MatX.cpp | 2 +- neo/sys/posix/platform_linux.cpp | 4 ++-- neo/sys/posix/posix_main.cpp | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/neo/idlib/math/MatX.cpp b/neo/idlib/math/MatX.cpp index 0e22113c..fb7a2ba7 100644 --- a/neo/idlib/math/MatX.cpp +++ b/neo/idlib/math/MatX.cpp @@ -227,7 +227,7 @@ void idMatX::CopyLowerToUpperTriangle() // compilers (e.g. MCST lcc, Intel icc) that use the C++ Front End from EDG (Edison Design Group) have a bug // - no suitable conversion function from "__m128c" to "float" // an explicit type conversion is used as a solution to this bug - const __m128 bottomMask[2] = { (__m128) __m128c( _mm_set1_epi32( 0 ) ), (__m128) __m128c( _mm_set1_epi32( -1 ) ) }; + const __m128 bottomMask[2] = { ( __m128 ) __m128c( _mm_set1_epi32( 0 ) ), ( __m128 ) __m128c( _mm_set1_epi32( -1 ) ) }; float* __restrict basePtr = ToFloatPtr(); diff --git a/neo/sys/posix/platform_linux.cpp b/neo/sys/posix/platform_linux.cpp index ef418186..1e4b0fe7 100644 --- a/neo/sys/posix/platform_linux.cpp +++ b/neo/sys/posix/platform_linux.cpp @@ -119,8 +119,8 @@ double Sys_ClockTicksPerSecond() ret = MeasureClockTicks(); init = true; - common->Printf( "measured CPU frequency: %g MHz\n", ret / 1000000.0 ); - return ret; + common->Printf( "measured CPU frequency: %g MHz\n", ret / 1000000.0 ); + return ret; } /* diff --git a/neo/sys/posix/posix_main.cpp b/neo/sys/posix/posix_main.cpp index 8c32dff4..81c5c528 100644 --- a/neo/sys/posix/posix_main.cpp +++ b/neo/sys/posix/posix_main.cpp @@ -263,16 +263,16 @@ double Sys_GetClockTicks() return ( double ) lo + ( double ) 0xFFFFFFFF * hi; // RB begin #elif defined( __x86_64__ ) - uint32_t lo, hi; - __asm__ __volatile__ ( "rdtsc" : "=a" (lo), "=d" (hi)); - return ( ( ( uint64_t )hi ) << 32 ) | lo; + uint32_t lo, hi; + __asm__ __volatile__( "rdtsc" : "=a"( lo ), "=d"( hi ) ); + return ( ( ( uint64_t )hi ) << 32 ) | lo; #else - //#error unsupported CPU - struct timespec now; + //#error unsupported CPU + struct timespec now; - clock_gettime( CLOCK_MONOTONIC, &now ); + clock_gettime( CLOCK_MONOTONIC, &now ); - return now.tv_sec * 1000000000LL + now.tv_nsec; + return now.tv_sec * 1000000000LL + now.tv_nsec; #endif // RB end }