Skip to content

Commit c4a4f5b

Browse files
committed
Merge pull request #131 from asottile/wswitch
Use -Werror=switch
2 parents b189a9c + ab0f112 commit c4a4f5b

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ all: _sass.so
1818

1919
build2/libsass/c/%.o: libsass/src/%.c
2020
@mkdir -p build2/libsass/c/
21-
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I./libsass/include $(PY_HEADERS) -c $^ -o $@ -c -O2 -fPIC -std=c++0x -Wall -Wno-parentheses
21+
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I./libsass/include $(PY_HEADERS) -c $^ -o $@ -c -O2 -fPIC -std=c++0x -Wall -Wno-parentheses -Werror=switch
2222

2323
build2/libsass/cpp/%.o: libsass/src/%.cpp
2424
@mkdir -p build2/libsass/cpp/
25-
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I./libsass/include $(PY_HEADERS) -c $^ -o $@ -c -O2 -fPIC -std=c++0x -Wall -Wno-parentheses
25+
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I./libsass/include $(PY_HEADERS) -c $^ -o $@ -c -O2 -fPIC -std=c++0x -Wall -Wno-parentheses -Werror=switch
2626

2727
build2/pysass.o: pysass.cpp
2828
@mkdir -p build2
29-
gcc -pthread -fno-strict-aliasing -Wno-write-strings -DNDEBUG -g -fwrapv -O2 -Wall -fPIC -I./libsass/include $(PY_HEADERS) -c $^ -o $@ -c -O2 -fPIC -std=c++0x -Wall -Wno-parentheses
29+
gcc -pthread -fno-strict-aliasing -Wno-write-strings -DNDEBUG -g -fwrapv -O2 -Wall -fPIC -I./libsass/include $(PY_HEADERS) -c $^ -o $@ -c -O2 -fPIC -std=c++0x -Wall -Wno-parentheses -Werror=switch
3030

3131
_sass.so: $(C_OBJECTS) $(CPP_OBJECTS) build2/pysass.o
3232
g++ -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro $^ -L./libsass -o $@ -fPIC -lstdc++

pysass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ static PyObject* _to_py_value(const union Sass_Value* value) {
8484
case SASS_SPACE:
8585
separator = sass_space;
8686
break;
87+
case SASS_HASH:
88+
assert(0);
89+
break;
8790
}
8891
for (i = 0; i < sass_list_get_length(value); i += 1) {
8992
PyTuple_SetItem(

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ def spawn(self, cmd):
7373
flags = ['-c', '-O2', '/EHsc', '/MT']
7474
link_flags = []
7575
else:
76-
flags = ['-fPIC', '-std=c++0x', '-Wall', '-Wno-parentheses']
76+
flags = [
77+
'-fPIC', '-std=c++0x', '-Wall', '-Wno-parentheses', '-Werror=switch',
78+
]
7779
platform.mac_ver()
7880
if platform.system() in ['Darwin', 'FreeBSD']:
7981
os.environ.setdefault('CC', 'clang')

0 commit comments

Comments
 (0)