diff options
Diffstat (limited to 'src/mongo/db/sorter/sorter.cpp')
| -rw-r--r-- | src/mongo/db/sorter/sorter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/sorter/sorter.cpp b/src/mongo/db/sorter/sorter.cpp index d3225a5ef4e..8cb5048c2fc 100644 --- a/src/mongo/db/sorter/sorter.cpp +++ b/src/mongo/db/sorter/sorter.cpp @@ -114,7 +114,7 @@ namespace mongo { /** Ensures a named file is deleted when this object goes out of scope */ class FileDeleter { public: - FileDeleter(const string& fileName) :_fileName(fileName) {} + FileDeleter(const std::string& fileName) :_fileName(fileName) {} ~FileDeleter() { DESTRUCTOR_GUARD( boost::filesystem::remove(_fileName); @@ -160,7 +160,7 @@ namespace mongo { > Settings; typedef std::pair<Key, Value> Data; - FileIterator(const string& fileName, + FileIterator(const std::string& fileName, const Settings& settings, boost::shared_ptr<FileDeleter> fileDeleter) : _settings(settings) @@ -257,7 +257,7 @@ namespace mongo { bool _done; boost::scoped_array<char> _buffer; boost::scoped_ptr<BufReader> _reader; - string _fileName; + std::string _fileName; boost::shared_ptr<FileDeleter> _fileDeleter; // Must outlive _file std::ifstream _file; }; @@ -274,7 +274,7 @@ namespace mongo { const SortOptions& opts, const Comparator& comp) : _opts(opts) - , _remaining(opts.limit ? opts.limit : numeric_limits<unsigned long long>::max()) + , _remaining(opts.limit ? opts.limit : std::numeric_limits<unsigned long long>::max()) , _first(true) , _greater(comp) { |