summaryrefslogtreecommitdiff
path: root/src/mongo/stdx
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/stdx')
-rw-r--r--src/mongo/stdx/chrono.h3
-rw-r--r--src/mongo/stdx/condition_variable.h6
-rw-r--r--src/mongo/stdx/functional.h33
-rw-r--r--src/mongo/stdx/list.h3
-rw-r--r--src/mongo/stdx/memory.h4
-rw-r--r--src/mongo/stdx/mutex.h22
-rw-r--r--src/mongo/stdx/thread.h4
7 files changed, 36 insertions, 39 deletions
diff --git a/src/mongo/stdx/chrono.h b/src/mongo/stdx/chrono.h
index 34ae8e20386..797b5d3b963 100644
--- a/src/mongo/stdx/chrono.h
+++ b/src/mongo/stdx/chrono.h
@@ -33,8 +33,7 @@
namespace mongo {
namespace stdx {
- namespace chrono = boost::chrono;
+namespace chrono = boost::chrono;
} // namespace stdx
} // namespace mongo
-
diff --git a/src/mongo/stdx/condition_variable.h b/src/mongo/stdx/condition_variable.h
index aa67b0c4be8..e3d77a853a8 100644
--- a/src/mongo/stdx/condition_variable.h
+++ b/src/mongo/stdx/condition_variable.h
@@ -33,9 +33,9 @@
namespace mongo {
namespace stdx {
- using condition_variable = boost::condition_variable;
- using condition_variable_any = boost::condition_variable_any;
- using cv_status = boost::cv_status;
+using condition_variable = boost::condition_variable;
+using condition_variable_any = boost::condition_variable_any;
+using cv_status = boost::cv_status;
} // namespace stdx
} // namespace mongo
diff --git a/src/mongo/stdx/functional.h b/src/mongo/stdx/functional.h
index a0e6079cac4..5850ce36eab 100644
--- a/src/mongo/stdx/functional.h
+++ b/src/mongo/stdx/functional.h
@@ -41,9 +41,9 @@
namespace mongo {
namespace stdx {
- using ::std::bind;
- using ::std::function;
- namespace placeholders = ::std::placeholders;
+using ::std::bind;
+using ::std::function;
+namespace placeholders = ::std::placeholders;
} // namespace stdx
} // namespace mongo
@@ -56,23 +56,22 @@ namespace stdx {
namespace mongo {
namespace stdx {
- using boost::bind;
- using boost::function;
+using boost::bind;
+using boost::function;
- namespace placeholders {
- static boost::arg<1> _1;
- static boost::arg<2> _2;
- static boost::arg<3> _3;
- static boost::arg<4> _4;
- static boost::arg<5> _5;
- static boost::arg<6> _6;
- static boost::arg<7> _7;
- static boost::arg<8> _8;
- static boost::arg<9> _9;
- } // namespace placeholders
+namespace placeholders {
+static boost::arg<1> _1;
+static boost::arg<2> _2;
+static boost::arg<3> _3;
+static boost::arg<4> _4;
+static boost::arg<5> _5;
+static boost::arg<6> _6;
+static boost::arg<7> _7;
+static boost::arg<8> _8;
+static boost::arg<9> _9;
+} // namespace placeholders
} // namespace stdx
} // namespace mongo
#endif
-
diff --git a/src/mongo/stdx/list.h b/src/mongo/stdx/list.h
index cd6c3accf81..7bd970615b7 100644
--- a/src/mongo/stdx/list.h
+++ b/src/mongo/stdx/list.h
@@ -33,8 +33,7 @@
namespace mongo {
namespace stdx {
- using std::list;
+using std::list;
} // namespace stdx
} // namespace mongo
-
diff --git a/src/mongo/stdx/memory.h b/src/mongo/stdx/memory.h
index 7bc01af79d9..1c4f512dc5a 100644
--- a/src/mongo/stdx/memory.h
+++ b/src/mongo/stdx/memory.h
@@ -37,7 +37,7 @@
namespace mongo {
namespace stdx {
- using ::std::make_unique;
+using ::std::make_unique;
} // namespace stdx
} // namespace mongo
@@ -49,7 +49,7 @@ namespace stdx {
namespace mongo {
namespace stdx {
- using boost::make_unique;
+using boost::make_unique;
} // namespace stdx
} // namespace mongo
diff --git a/src/mongo/stdx/mutex.h b/src/mongo/stdx/mutex.h
index 0eeb9163e17..bdb5f2f6486 100644
--- a/src/mongo/stdx/mutex.h
+++ b/src/mongo/stdx/mutex.h
@@ -35,16 +35,16 @@
namespace mongo {
namespace stdx {
- using boost::mutex;
- using boost::timed_mutex;
- using boost::recursive_mutex;
+using boost::mutex;
+using boost::timed_mutex;
+using boost::recursive_mutex;
- using boost::adopt_lock_t;
- using boost::defer_lock_t;
- using boost::try_to_lock_t;
+using boost::adopt_lock_t;
+using boost::defer_lock_t;
+using boost::try_to_lock_t;
- using boost::lock_guard;
- using boost::unique_lock;
+using boost::lock_guard;
+using boost::unique_lock;
#if _MSC_VER < 1900
#define MONGO_STDX_CONSTEXPR const
@@ -52,9 +52,9 @@ namespace stdx {
#define MONGO_STDX_CONSTEXPR constexpr
#endif
- MONGO_STDX_CONSTEXPR adopt_lock_t adopt_lock{};
- MONGO_STDX_CONSTEXPR defer_lock_t defer_lock{};
- MONGO_STDX_CONSTEXPR try_to_lock_t try_to_lock{};
+MONGO_STDX_CONSTEXPR adopt_lock_t adopt_lock{};
+MONGO_STDX_CONSTEXPR defer_lock_t defer_lock{};
+MONGO_STDX_CONSTEXPR try_to_lock_t try_to_lock{};
#undef MONGO_STDX_CONSTEXPR
diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h
index d38d696d1ff..3b9490b2d67 100644
--- a/src/mongo/stdx/thread.h
+++ b/src/mongo/stdx/thread.h
@@ -33,8 +33,8 @@
namespace mongo {
namespace stdx {
- using thread = boost::thread;
- namespace this_thread = boost::this_thread;
+using thread = boost::thread;
+namespace this_thread = boost::this_thread;
} // namespace stdx
} // namespace mongo