diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-04-20 14:27:52 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-04-20 14:27:52 +1000 |
| commit | f00008fa5a49722171c5b288f988a64443122115 (patch) | |
| tree | 855e70e68d53dac0fa86e4cf5296e6ae5b9884de /src/RunStyles.cxx | |
| parent | 9aa7e7b0559cbf2b4d6d298fe2d546eb5a5a956e (diff) | |
| download | scintilla-mirror-f00008fa5a49722171c5b288f988a64443122115.tar.gz | |
Stop "duplicate explicit instantiation" error on g++ 32-bit where int and
ptrdiff_t are the same type.
Diffstat (limited to 'src/RunStyles.cxx')
| -rw-r--r-- | src/RunStyles.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx index f92da5047..23392436b 100644 --- a/src/RunStyles.cxx +++ b/src/RunStyles.cxx @@ -6,9 +6,11 @@ #include <cstddef> #include <cstdlib> +#include <cstdint> #include <cstring> #include <cstdio> #include <cstdarg> +#include <climits> #include <stdexcept> #include <vector> @@ -306,5 +308,7 @@ void RunStyles<DISTANCE, STYLE>::Check() const { template class Scintilla::RunStyles<int, int>; template class Scintilla::RunStyles<int, char>; +#if PTRDIFF_MAX != INT_MAX template class Scintilla::RunStyles<ptrdiff_t, int>; template class Scintilla::RunStyles<ptrdiff_t, char>; +#endif |