diff options
author | Eliot Horowitz <eliot@10gen.com> | 2013-07-08 11:22:35 -0400 |
---|---|---|
committer | Eliot Horowitz <eliot@10gen.com> | 2013-07-08 18:11:04 -0400 |
commit | b46eec4b5770036d8e4e5ab91c0bd983972b1683 (patch) | |
tree | 2c31d0a15693310b73752321b138efe437bfbfec | |
parent | 08840d93facf8f5440c4184063b7a972327fde44 (diff) | |
download | mongo-b46eec4b5770036d8e4e5ab91c0bd983972b1683.tar.gz |
Namespace: include what you use
-rw-r--r-- | src/mongo/db/storage/namespace.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/storage/namespace.h | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/mongo/db/storage/namespace.cpp b/src/mongo/db/storage/namespace.cpp index 7134efd3cd1..045f56b949e 100644 --- a/src/mongo/db/storage/namespace.cpp +++ b/src/mongo/db/storage/namespace.cpp @@ -19,6 +19,8 @@ #include <boost/static_assert.hpp> +#include "mongo/pch.h" + #include "mongo/db/storage/namespace.h" #include "mongo/db/namespace_string.h" diff --git a/src/mongo/db/storage/namespace.h b/src/mongo/db/storage/namespace.h index fbb6d9417b5..74ab5781d3a 100644 --- a/src/mongo/db/storage/namespace.h +++ b/src/mongo/db/storage/namespace.h @@ -21,6 +21,8 @@ #include <cstring> #include <string> +#include "mongo/base/string_data.h" + namespace mongo { #pragma pack(1) @@ -47,13 +49,13 @@ namespace mongo { size_t size() const { return strlen( buf ); } - string toString() const { return buf; } - operator string() const { return buf; } + std::string toString() const { return buf; } + operator std::string() const { return buf; } /* NamespaceDetails::Extra was added after fact to allow chaining of data blocks to support more than 10 indexes (more than 10 IndexDetails). It's a bit hacky because of this late addition with backward file support. */ - string extraName(int i) const; + std::string extraName(int i) const; bool isExtra() const; /* ends with $extr... -- when true an extra block not a normal NamespaceDetails block */ enum MaxNsLenValue { MaxNsLen = 128 }; |