diff options
author | John Fultz <jfultz@wolfram.com> | 2015-07-21 10:18:57 -0500 |
---|---|---|
committer | John Fultz <jfultz@wolfram.com> | 2015-07-21 10:18:57 -0500 |
commit | d912747a68c38baa1d19e07067d8c691f29f8198 (patch) | |
tree | f221b417220ffe5b6adbf3ca8210c788379d7842 /generator.cpp | |
parent | 46fc18d0d167cc6feacfb41fadb207a1234ccc26 (diff) |
Visual Studio build maintenance.
* Fix compiler warnings
* Add Visual Studio 2013 solution
* Tweak .pro files
* Most importantly, rename main 'quackle' project to
'libquackle' to avoid solution-level name conflict. This
only affects the VS build.
Diffstat (limited to 'generator.cpp')
-rw-r--r-- | generator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generator.cpp b/generator.cpp index 5958b72..2bfc199 100644 --- a/generator.cpp +++ b/generator.cpp @@ -444,8 +444,8 @@ void Generator::readFromDawg(int index, unsigned int &p, Letter &letter, bool &t p = (QUACKLE_LEXICON_PARAMETERS->dawgAt(index) << 16) + (QUACKLE_LEXICON_PARAMETERS->dawgAt(index + 1) << 8) + (QUACKLE_LEXICON_PARAMETERS->dawgAt(index + 2)); letter = QUACKLE_LEXICON_PARAMETERS->dawgAt(index + 3); - t = (letter & 32); - lastchild = (letter & 64); + t = (letter & 32) != 0; + lastchild = (letter & 64) != 0; british = !(letter & 128); letter = (letter & 31) + QUACKLE_FIRST_LETTER; |