diff options
Diffstat (limited to 'constexpr.patch')
| -rw-r--r-- | constexpr.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/constexpr.patch b/constexpr.patch new file mode 100644 index 000000000000..81ea4b770b63 --- /dev/null +++ b/constexpr.patch @@ -0,0 +1,30 @@ +diff --git a/CC/include/CCConst.h b/CC/include/CCConst.h +index 8ab70a93..33808059 100644 +--- a/CC/include/CCConst.h ++++ b/CC/include/CCConst.h +@@ -40,10 +40,10 @@ constexpr double M_PI_2 = (M_PI/2.0); + constexpr double SQRT_3 = 1.7320508075688772935274463415059; + + //! Conversion factor from radians to degrees +-constexpr double CC_RAD_TO_DEG = (180.0/M_PI); ++const double CC_RAD_TO_DEG = (180.0/M_PI); + + //! Conversion factor from degrees to radians +-constexpr double CC_DEG_TO_RAD = (M_PI/180.0); ++const double CC_DEG_TO_RAD = (M_PI/180.0); + + //! Numerical threshold for considering a value as "zero" + constexpr double ZERO_TOLERANCE = static_cast<double>(FLT_EPSILON); +diff --git a/libs/qCC_db/ccColorTypes.h b/libs/qCC_db/ccColorTypes.h +index f70025cb..3e3a3b79 100644 +--- a/libs/qCC_db/ccColorTypes.h ++++ b/libs/qCC_db/ccColorTypes.h +@@ -119,7 +119,7 @@ namespace ccColor + + // Predefined colors (default type) + constexpr Rgb white (MAX, MAX, MAX); +- constexpr Rgb lightGrey (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8)); ++ const Rgb lightGrey (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8)); + constexpr Rgb darkGrey (MAX / 2, MAX / 2, MAX / 2); + constexpr Rgb red (MAX, 0, 0); + constexpr Rgb green (0, MAX, 0); |