SERVER-40813 remove all -inl.h files

2 files changed, 66 insertions, 102 deletions

diff --git a/src/mongo/base/status-inl.h b/src/mongo/base/status-inl.h
deleted file mode 100644
index 742cc4714b5..00000000000
--- a/src/mongo/base/status-inl.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- *    Copyright (C) 2018-present MongoDB, Inc.
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the Server Side Public License, version 1,
- *    as published by MongoDB, Inc.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    Server Side Public License for more details.
- *
- *    You should have received a copy of the Server Side Public License
- *    along with this program. If not, see
- *    <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- *    As a special exception, the copyright holders give permission to link the
- *    code of portions of this program with the OpenSSL library under certain
- *    conditions as described in each individual source file and distribute
- *    linked combinations including the program with the OpenSSL library. You
- *    must comply with the Server Side Public License in all respects for
- *    all of the code used other than as permitted herein. If you modify file(s)
- *    with this exception, you may extend this exception to your version of the
- *    file(s), but you are not obligated to do so. If you do not wish to do so,
- *    delete this exception statement from your version. If you delete this
- *    exception statement from all source files in the program, then also delete
- *    it in the license file.
- */
-
-#pragma once
-
-namespace mongo {
-
-inline Status Status::OK() {
-    return Status();
-}
-
-inline Status::Status(const Status& other) : _error(other._error) {
-    ref(_error);
-}
-
-inline Status& Status::operator=(const Status& other) {
-    ref(other._error);
-    unref(_error);
-    _error = other._error;
-    return *this;
-}
-
-inline Status::Status(Status&& other) noexcept : _error(other._error) {
-    other._error = nullptr;
-}
-
-inline Status& Status::operator=(Status&& other) noexcept {
-    unref(_error);
-    _error = other._error;
-    other._error = nullptr;
-    return *this;
-}
-
-inline Status::~Status() {
-    unref(_error);
-}
-
-inline bool Status::isOK() const {
-    return !_error;
-}
-
-inline ErrorCodes::Error Status::code() const {
-    return _error ? _error->code : ErrorCodes::OK;
-}
-
-inline std::string Status::codeString() const {
-    return ErrorCodes::errorString(code());
-}
-
-inline unsigned Status::refCount() const {
-    return _error ? _error->refs.load() : 0;
-}
-
-inline Status::Status() : _error(NULL) {}
-
-inline void Status::ref(ErrorInfo* error) {
-    if (error)
-        error->refs.fetchAndAdd(1);
-}
-
-inline void Status::unref(ErrorInfo* error) {
-    if (error && (error->refs.subtractAndFetch(1) == 0))
-        delete error;
-}
-
-inline bool operator==(const ErrorCodes::Error lhs, const Status& rhs) {
-    return rhs == lhs;
-}
-
-inline bool operator!=(const ErrorCodes::Error lhs, const Status& rhs) {
-    return rhs != lhs;
-}
-
-}  // namespace mongo
diff --git a/src/mongo/base/status.h b/src/mongo/base/status.h
index 61a155e98cf..52a46d0adb0 100644
--- a/src/mongo/base/status.h
+++ b/src/mongo/base/status.h
@@ -266,6 +266,70 @@ std::ostream& operator<<(std::ostream& os, const Status& status);
 template <typename Allocator>
 StringBuilderImpl<Allocator>& operator<<(StringBuilderImpl<Allocator>& os, const Status& status);
 
-}  // namespace mongo
+inline Status Status::OK() {
+    return Status();
+}
+
+inline Status::Status(const Status& other) : _error(other._error) {
+    ref(_error);
+}
+
+inline Status& Status::operator=(const Status& other) {
+    ref(other._error);
+    unref(_error);
+    _error = other._error;
+    return *this;
+}
+
+inline Status::Status(Status&& other) noexcept : _error(other._error) {
+    other._error = nullptr;
+}
+
+inline Status& Status::operator=(Status&& other) noexcept {
+    unref(_error);
+    _error = other._error;
+    other._error = nullptr;
+    return *this;
+}
+
+inline Status::~Status() {
+    unref(_error);
+}
+
+inline bool Status::isOK() const {
+    return !_error;
+}
+
+inline ErrorCodes::Error Status::code() const {
+    return _error ? _error->code : ErrorCodes::OK;
+}
+
+inline std::string Status::codeString() const {
+    return ErrorCodes::errorString(code());
+}
+
+inline unsigned Status::refCount() const {
+    return _error ? _error->refs.load() : 0;
+}
+
+inline Status::Status() : _error(NULL) {}
+
+inline void Status::ref(ErrorInfo* error) {
+    if (error)
+        error->refs.fetchAndAdd(1);
+}
+
+inline void Status::unref(ErrorInfo* error) {
+    if (error && (error->refs.subtractAndFetch(1) == 0))
+        delete error;
+}
+
+inline bool operator==(const ErrorCodes::Error lhs, const Status& rhs) {
+    return rhs == lhs;
+}
+
+inline bool operator!=(const ErrorCodes::Error lhs, const Status& rhs) {
+    return rhs != lhs;
+}
 
-#include "mongo/base/status-inl.h"
+}  // namespace mongo