Skip to content

Commit b71ffa0

Browse files
committed
ROOT-7004: don't include regex header in pch only on mac
this allows the testsuite to pass, to protect against slc6-cc7 compatibility issues but does not fix the naming issue with regex, the name of which cannot be constructed on mac and is wrong on linux.
1 parent c4f7a25 commit b71ffa0

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

build/unix/makepchinput.sh

+6
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ for stlHeader in $stlHeaders; do
3535
echo '#endif' >> $allheaders
3636
done
3737

38+
# Special case for regex
39+
echo "// treat regex separately" >> $allheaders
40+
echo '#if __has_include("regex") && !defined __APPLE__' >> $allheaders
41+
echo '#include <regex>' >> $allheaders
42+
echo '#endif' >> $allheaders
43+
3844
# treat this deprecated headers in a special way
3945
stlDeprecatedHeaders="strstream"
4046
echo "// STL Deprecated headers" >> $allheaders

0 commit comments

Comments
 (0)