diff options
Diffstat (limited to 'src/common/chunk_file.h')
| -rw-r--r-- | src/common/chunk_file.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index dc8ac1fd9..609784076 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h | |||
| @@ -51,7 +51,7 @@ public: | |||
| 51 | PointerWrapSection(PointerWrap &p, int ver, const char *title) : p_(p), ver_(ver), title_(title) { | 51 | PointerWrapSection(PointerWrap &p, int ver, const char *title) : p_(p), ver_(ver), title_(title) { |
| 52 | } | 52 | } |
| 53 | ~PointerWrapSection(); | 53 | ~PointerWrapSection(); |
| 54 | 54 | ||
| 55 | bool operator == (const int &v) const { return ver_ == v; } | 55 | bool operator == (const int &v) const { return ver_ == v; } |
| 56 | bool operator != (const int &v) const { return ver_ != v; } | 56 | bool operator != (const int &v) const { return ver_ != v; } |
| 57 | bool operator <= (const int &v) const { return ver_ <= v; } | 57 | bool operator <= (const int &v) const { return ver_ <= v; } |
| @@ -196,7 +196,7 @@ public: | |||
| 196 | } | 196 | } |
| 197 | (*ptr) += size; | 197 | (*ptr) += size; |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | template<class K, class T> | 200 | template<class K, class T> |
| 201 | void Do(std::map<K, T *> &x) | 201 | void Do(std::map<K, T *> &x) |
| 202 | { | 202 | { |
| @@ -364,7 +364,7 @@ public: | |||
| 364 | if (vec_size > 0) | 364 | if (vec_size > 0) |
| 365 | DoArray(&x[0], vec_size); | 365 | DoArray(&x[0], vec_size); |
| 366 | } | 366 | } |
| 367 | 367 | ||
| 368 | // Store deques. | 368 | // Store deques. |
| 369 | template<class T> | 369 | template<class T> |
| 370 | void Do(std::deque<T *> &x) | 370 | void Do(std::deque<T *> &x) |
| @@ -481,11 +481,11 @@ public: | |||
| 481 | } | 481 | } |
| 482 | 482 | ||
| 483 | // Store strings. | 483 | // Store strings. |
| 484 | void Do(std::string &x) | 484 | void Do(std::string &x) |
| 485 | { | 485 | { |
| 486 | int stringLen = (int)x.length() + 1; | 486 | int stringLen = (int)x.length() + 1; |
| 487 | Do(stringLen); | 487 | Do(stringLen); |
| 488 | 488 | ||
| 489 | switch (mode) { | 489 | switch (mode) { |
| 490 | case MODE_READ: x = (char*)*ptr; break; | 490 | case MODE_READ: x = (char*)*ptr; break; |
| 491 | case MODE_WRITE: memcpy(*ptr, x.c_str(), stringLen); break; | 491 | case MODE_WRITE: memcpy(*ptr, x.c_str(), stringLen); break; |
| @@ -495,7 +495,7 @@ public: | |||
| 495 | (*ptr) += stringLen; | 495 | (*ptr) += stringLen; |
| 496 | } | 496 | } |
| 497 | 497 | ||
| 498 | void Do(std::wstring &x) | 498 | void Do(std::wstring &x) |
| 499 | { | 499 | { |
| 500 | int stringLen = sizeof(wchar_t)*((int)x.length() + 1); | 500 | int stringLen = sizeof(wchar_t)*((int)x.length() + 1); |
| 501 | Do(stringLen); | 501 | Do(stringLen); |
| @@ -534,7 +534,7 @@ public: | |||
| 534 | void Do(T &x) { | 534 | void Do(T &x) { |
| 535 | DoHelper<T>::Do(this, x); | 535 | DoHelper<T>::Do(this, x); |
| 536 | } | 536 | } |
| 537 | 537 | ||
| 538 | template<class T> | 538 | template<class T> |
| 539 | void DoPOD(T &x) { | 539 | void DoPOD(T &x) { |
| 540 | DoHelper<T>::Do(this, x); | 540 | DoHelper<T>::Do(this, x); |