Changeset 867 for cpp/common

Timestamp:

04/21/19 16:36:22 (6 years ago)

Author:

Maciej Komosinski

Message:

Code formatting + cosmetic fixes

Location:

cpp/common

Files:

• nonstd_math.cpp (modified) (6 diffs)
• random.h (modified) (1 diff)
• util-string.cpp (modified) (2 diffs)

cpp/common/nonstd_math.cpp

@@ -7 +7 @@
 RandomGenerator& rndGetInstance()
 {
-static RandomGenerator rnd(0);
-return rnd;
+        static RandomGenerator rnd(0);
+        return rnd;
 }
 
@@ -50 +50 @@
 void fpExceptEnable()
 {
-feclearexcept(FE_DIVBYZERO);
-feenableexcept(FE_DIVBYZERO);
+        feclearexcept(FE_DIVBYZERO);
+        feenableexcept(FE_DIVBYZERO);
 }
 
 void fpExceptDisable()
 {
-fedisableexcept(FE_DIVBYZERO);
+        fedisableexcept(FE_DIVBYZERO);
 }
 
@@ -83 +83 @@
         //unsigned int was=_clear87();
         //logPrintf("","fpExceptInit",LOG_INFO,"control87 status before clear was %08x", was);
-        fp_control_word_std=_control87(0, 0);             //4978 = 1001101110010
+        fp_control_word_std = _control87(0, 0);             //4978 = 1001101110010
         // Make the new fp env same as the old one, except for the changes we're going to make
         fp_control_word_muted = fp_control_word_std | EM_INVALID | EM_DENORMAL | EM_ZERODIVIDE | EM_OVERFLOW | EM_UNDERFLOW | EM_INEXACT;  //4991 = 1001101111111
@@ -90 +90 @@
 void fpExceptEnable()
 {
-        unsigned int was=_clear87(); //trzeba czyscic zeby nie bylo exception...
+        unsigned int was = _clear87(); //trzeba czyscic zeby nie bylo exception...
         //logPrintf("","fpExceptEnable ",LOG_INFO,"control87 status before clear was %08x", was);
         _control87(fp_control_word_std, 0xffffffff);
@@ -98 +98 @@
 void fpExceptDisable()
 {
-        unsigned int was=_clear87(); //trzeba czyscic zeby nie bylo exception...
+        unsigned int was = _clear87(); //trzeba czyscic zeby nie bylo exception...
         //logPrintf("","fpExceptDisable",LOG_INFO,"control87 status before clear was %08x", was);
         _control87(fp_control_word_muted, 0xffffffff);
@@ -116 +116 @@
 void fpExceptDisable() {}
 #endif
-

cpp/common/random.h

@@ -116 +116 @@
         //UniformRandomBitGenerator
         typedef unsigned int result_type;
-        static unsigned int min() {return 0;}
-        static unsigned int max() {return MAXVALUE;}
+        static constexpr unsigned int min() {return 0;}
+        static constexpr unsigned int max() {return MAXVALUE;}
         inline unsigned int operator()() {return getUint32();}
 

cpp/common/util-string.cpp

@@ -43 +43 @@
 #ifdef VSNPRINTF_RETURNS_REQUIRED_SIZE
                 if (n > -1)    /* glibc 2.1 */
-                        size = n+1; /* precisely what is needed */
+                        size = n + 1; /* precisely what is needed */
                 else           /* glibc 2.0 */
 #endif
@@ -82 +82 @@
         size_t sep = filename.rfind(PATH_SEPARATOR_CHAR);
         if (sep == string::npos) return filename;
-        return filename.substr(sep+1);
+        return filename.substr(sep + 1);
 }