[Libreoffice-commits] core.git: include/tools sc/source tools/source

[Tomaž Vajngerl]

 include/tools/cpuid.hxx                |    4 ++--
 sc/source/core/inc/arraysumfunctor.hxx |    4 ++--
 tools/source/misc/cpuid.cxx            |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f115b0cf1b23baf18aa56866aa7f15d5a5991c37
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Fri Nov 13 17:59:52 2015 +0100

    underscores are reserved
    
    Change-Id: Iee60389ccc9e348db6ed00e48e32b1e86f17b530

diff --git a/include/tools/cpuid.hxx b/include/tools/cpuid.hxx
index 348724e..f058f23 100644
--- a/include/tools/cpuid.hxx
+++ b/include/tools/cpuid.hxx
@@ -15,9 +15,9 @@
 #include <tools/toolsdllapi.h>
 
 #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && defined(__SSE2__)
-#define __LO_SSE2_AVAILABLE__ 1
+#define LO_SSE2_AVAILABLE 1
 #elif defined(_MSC_VER) && (defined(_M_AMD64) || (defined(_M_IX86) && defined(_M_IX86_FP) && _M_IX86_FP >= 2))
-#define __LO_SSE2_AVAILABLE__ 1
+#define LO_SSE2_AVAILABLE 1
 #endif
 
 namespace tools
diff --git a/sc/source/core/inc/arraysumfunctor.hxx b/sc/source/core/inc/arraysumfunctor.hxx
index 34ccd81..e9ef404 100644
--- a/sc/source/core/inc/arraysumfunctor.hxx
+++ b/sc/source/core/inc/arraysumfunctor.hxx
@@ -13,7 +13,7 @@
 
 #include <tools/cpuid.hxx>
 
-#if defined(__LO_SSE2_AVAILABLE__)
+#if defined(LO_SSE2_AVAILABLE)
 #include <emmintrin.h>
 #endif
 
@@ -70,7 +70,7 @@ public:
 private:
     inline double executeSSE2(size_t& i, const double* pCurrent) const
     {
-#if defined(__LO_SSE2_AVAILABLE__)
+#if defined(LO_SSE2_AVAILABLE)
         double fSum = 0.0;
         size_t nRealSize = mnSize - i;
         size_t nUnrolledSize = nRealSize - (nRealSize % 8);
diff --git a/tools/source/misc/cpuid.cxx b/tools/source/misc/cpuid.cxx
index 5e052fb..9cdc499 100644
--- a/tools/source/misc/cpuid.cxx
+++ b/tools/source/misc/cpuid.cxx
@@ -16,7 +16,7 @@ namespace tools
 namespace cpuid
 {
 
-#if defined(__LO_SSE2_AVAILABLE__)
+#if defined(LO_SSE2_AVAILABLE)
 
 namespace
 {