Skip to content

Commit 0a93235

Browse files
xzyferxzyfer
committed
Fix some build errors on Windows
1 parent 9b4e424 commit 0a93235

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

‎src/units.cpp

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -52,70 +52,70 @@ namespace Sass {
5252
{
5353
switch (unit & 0xFF00)
5454
{
55-
case SIZE: return SIZE; break;
56-
case ANGLE: return ANGLE; break;
57-
case TIME: return TIME; break;
58-
case FREQUENCY: return FREQUENCY; break;
59-
case RESOLUTION: return RESOLUTION; break;
60-
default: return INCOMMENSURABLE; break;
55+
case SassUnitType::SIZE: return SassUnitType::SIZE; break;
56+
case SassUnitType::ANGLE: return SassUnitType::ANGLE; break;
57+
case SassUnitType::TIME: return SassUnitType::TIME; break;
58+
case SassUnitType::FREQUENCY: return SassUnitType::FREQUENCY; break;
59+
case SassUnitType::RESOLUTION: return SassUnitType::RESOLUTION; break;
60+
default: return SassUnitType::INCOMMENSURABLE; break;
6161
}
6262
};
6363

6464
SassUnit string_to_unit(const string& s)
6565
{
6666
// size units
67-
if (s == "px") return PX;
68-
else if (s == "pt") return PT;
69-
else if (s == "pc") return PC;
70-
else if (s == "mm") return MM;
71-
else if (s == "cm") return CM;
72-
else if (s == "in") return IN;
67+
if (s == "px") return SassUnit::PX;
68+
else if (s == "pt") return SassUnit::PT;
69+
else if (s == "pc") return SassUnit::PC;
70+
else if (s == "mm") return SassUnit::MM;
71+
else if (s == "cm") return SassUnit::CM;
72+
else if (s == "in") return SassUnit::IN;
7373
// angle units
74-
else if (s == "deg") return DEG;
75-
else if (s == "grad") return GRAD;
76-
else if (s == "rad") return RAD;
77-
else if (s == "turn") return TURN;
74+
else if (s == "deg") return SassUnit::DEG;
75+
else if (s == "grad") return SassUnit::GRAD;
76+
else if (s == "rad") return SassUnit::RAD;
77+
else if (s == "turn") return SassUnit::TURN;
7878
// time units
79-
else if (s == "s") return SEC;
80-
else if (s == "ms") return MSEC;
79+
else if (s == "s") return SassUnit::SEC;
80+
else if (s == "ms") return SassUnit::MSEC;
8181
// frequency units
82-
else if (s == "Hz") return HERTZ;
83-
else if (s == "kHz") return KHERTZ;
82+
else if (s == "Hz") return SassUnit::HERTZ;
83+
else if (s == "kHz") return SassUnit::KHERTZ;
8484
// resolutions units
85-
else if (s == "dpi") return DPI;
86-
else if (s == "dpcm") return DPCM;
87-
else if (s == "dppx") return DPPX;
85+
else if (s == "dpi") return SassUnit::DPI;
86+
else if (s == "dpcm") return SassUnit::DPCM;
87+
else if (s == "dppx") return SassUnit::DPPX;
8888
// for unknown units
89-
else return UNKNOWN;
89+
else return SassUnit::UNKNOWN;
9090
}
9191

9292
const char* unit_to_string(SassUnit unit)
9393
{
9494
switch (unit) {
9595
// size units
96-
case PX: return "px"; break;
97-
case PT: return "pt"; break;
98-
case PC: return "pc"; break;
99-
case MM: return "mm"; break;
100-
case CM: return "cm"; break;
101-
case IN: return "in"; break;
96+
case SassUnit::PX: return "px"; break;
97+
case SassUnit::PT: return "pt"; break;
98+
case SassUnit::PC: return "pc"; break;
99+
case SassUnit::MM: return "mm"; break;
100+
case SassUnit::CM: return "cm"; break;
101+
case SassUnit::IN: return "in"; break;
102102
// angle units
103-
case DEG: return "deg"; break;
104-
case GRAD: return "grad"; break;
105-
case RAD: return "rad"; break;
106-
case TURN: return "turn"; break;
103+
case SassUnit::DEG: return "deg"; break;
104+
case SassUnit::GRAD: return "grad"; break;
105+
case SassUnit::RAD: return "rad"; break;
106+
case SassUnit::TURN: return "turn"; break;
107107
// time units
108-
case SEC: return "s"; break;
109-
case MSEC: return "ms"; break;
108+
case SassUnit::SEC: return "s"; break;
109+
case SassUnit::MSEC: return "ms"; break;
110110
// frequency units
111-
case HERTZ: return "Hz"; break;
112-
case KHERTZ: return "kHz"; break;
111+
case SassUnit::HERTZ: return "Hz"; break;
112+
case SassUnit::KHERTZ: return "kHz"; break;
113113
// resolutions units
114-
case DPI: return "dpi"; break;
115-
case DPCM: return "dpcm"; break;
116-
case DPPX: return "dppx"; break;
114+
case SassUnit::DPI: return "dpi"; break;
115+
case SassUnit::DPCM: return "dpcm"; break;
116+
case SassUnit::DPPX: return "dppx"; break;
117117
// for unknown units
118-
default: return ""; break;;
118+
default: return ""; break;
119119
}
120120
}
121121

@@ -140,13 +140,13 @@ namespace Sass {
140140
// only process known units
141141
if (u1 != UNKNOWN && u2 != UNKNOWN) {
142142
switch (t1) {
143-
case SIZE: return size_conversion_factors[i1][i2]; break;
144-
case ANGLE: return angle_conversion_factors[i1][i2]; break;
145-
case TIME: return time_conversion_factors[i1][i2]; break;
146-
case FREQUENCY: return frequency_conversion_factors[i1][i2]; break;
147-
case RESOLUTION: return resolution_conversion_factors[i1][i2]; break;
143+
case SassUnitType::SIZE: return size_conversion_factors[i1][i2]; break;
144+
case SassUnitType::ANGLE: return angle_conversion_factors[i1][i2]; break;
145+
case SassUnitType::TIME: return time_conversion_factors[i1][i2]; break;
146+
case SassUnitType::FREQUENCY: return frequency_conversion_factors[i1][i2]; break;
147+
case SassUnitType::RESOLUTION: return resolution_conversion_factors[i1][i2]; break;
148148
// ToDo: should we throw error here?
149-
case INCOMMENSURABLE: return 0; break;
149+
case SassUnitType::INCOMMENSURABLE: return 0; break;
150150
}
151151
}
152152
// fallback

0 commit comments

Comments
 (0)