diff options
| author | Ulrich Germann <ulrich.germann@cs.toronto.edu> | 2014-09-10 14:07:57 +0400 |
|---|---|---|
| committer | Ulrich Germann <ulrich.germann@cs.toronto.edu> | 2014-09-10 14:07:57 +0400 |
| commit | a58c7ceb18591d2f25f81fcdcd4264b0f294346e (patch) | |
| tree | 4f5fce73fca427ad9945a569032204e22f00f91e /util | |
| parent | 31578d4915c74056057cb7059e9d479a1bd94bcb (diff) | |
Fixed issues with ambiguity in typedef of uint64_t (conflict between boost typedef and stdint typedef).
Diffstat (limited to 'util')
| -rw-r--r-- | util/usage.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/usage.hh b/util/usage.hh index e578b0a65..5407f5a54 100644 --- a/util/usage.hh +++ b/util/usage.hh @@ -13,9 +13,9 @@ double WallTime(); void PrintUsage(std::ostream &to); // Determine how much physical memory there is. Return 0 on failure. -uint64_t GuessPhysicalMemory(); +::uint64_t GuessPhysicalMemory(); // Parse a size like unix sort. Sadly, this means the default multiplier is K. -uint64_t ParseSize(const std::string &arg); +::uint64_t ParseSize(const std::string &arg); } // namespace util #endif // UTIL_USAGE_H |