diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /common/huffman.h | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
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; |