Merge pull request #1458 from drewwells/feature/renameToLength

rename SIZE to LENGTH to avoid conflict with windows headers
sass · Aug 20, 2015 · 0ae11a4 · 0ae11a4
2 parents 5e8e268 + 6360d13
commit 0ae11a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/units.cpp b/src/units.cpp
@@ -56,7 +56,7 @@ namespace Sass {
   {
     switch (unit & 0xFF00)
     {
-      case SassUnitType::SIZE:        return SassUnitType::SIZE; break;
+      case SassUnitType::LENGTH:      return SassUnitType::LENGTH; break;
       case SassUnitType::ANGLE:       return SassUnitType::ANGLE; break;
       case SassUnitType::TIME:        return SassUnitType::TIME; break;
       case SassUnitType::FREQUENCY:   return SassUnitType::FREQUENCY; break;
@@ -144,7 +144,7 @@ namespace Sass {
     // only process known units
     if (u1 != UNKNOWN && u2 != UNKNOWN) {
       switch (t1) {
-        case SassUnitType::SIZE:              return size_conversion_factors[i1][i2]; break;
+        case SassUnitType::LENGTH:              return size_conversion_factors[i1][i2]; break;
         case SassUnitType::ANGLE:             return angle_conversion_factors[i1][i2]; break;
         case SassUnitType::TIME:              return time_conversion_factors[i1][i2]; break;
         case SassUnitType::FREQUENCY:         return frequency_conversion_factors[i1][i2]; break;

diff --git a/src/units.hpp b/src/units.hpp
@@ -10,7 +10,7 @@ namespace Sass {
   const double PI = acos(-1);
 
   enum SassUnitType {
-    SIZE = 0x000,
+    LENGTH = 0x000,
     ANGLE = 0x100,
     TIME = 0x200,
     FREQUENCY = 0x300,
@@ -21,7 +21,7 @@ namespace Sass {
   enum SassUnit {
 
     // size units
-    IN = SIZE,
+    IN = SassUnitType::LENGTH,
     CM,
     PC,
     MM,