diff options
| author | Vicent Marti | 2008-06-14 14:44:29 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-06-14 14:44:29 +0000 |
| commit | d0b27cf9c66b9281899acf826cb205e19dcb7260 (patch) | |
| tree | 74e813b1d1f081f35f41ca7a95da5d048951b9e7 /common/file.cpp | |
| parent | d51a0cab3fe494698f001d81d5d86cea7cd0395b (diff) | |
| parent | 91d3ea31359950b59ee46af8355cc0f5790257e5 (diff) | |
| download | scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.gz scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.bz2 scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.zip | |
Merged trunk into the GUI branch.
Fixed MSVS9 project files.
svn-id: r32702
Diffstat (limited to 'common/file.cpp')
| -rw-r--r-- | common/file.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/file.cpp b/common/file.cpp index 4a7aed0e3d..386777e2c5 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -136,7 +136,7 @@ namespace Common { -typedef HashMap<String, int, CaseSensitiveString_Hash, CaseSensitiveString_EqualTo> StringIntMap; +typedef HashMap<String, int> StringIntMap; // The following two objects could be turned into static members of class // File. However, then we would be forced to #include hashmap in file.h |