diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /common/huffman.h | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'common/huffman.h')
| -rw-r--r-- | common/huffman.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/huffman.h b/common/huffman.h index 9a8b712c23..4175d0d309 100644 --- a/common/huffman.h +++ b/common/huffman.h @@ -66,9 +66,9 @@ private: Symbol(uint32 c, uint32 s); }; - typedef Common::List<Symbol> CodeList; - typedef Common::Array<CodeList> CodeLists; - typedef Common::Array<Symbol *> SymbolList; + typedef List<Symbol> CodeList; + typedef Array<CodeList> CodeLists; + typedef Array<Symbol*> SymbolList; /** Lists of codes and their symbols, sorted by code length. */ CodeLists _codes; |