remove db/concurrency.h which has nothing in it

7 files changed, 3 insertions, 28 deletions

diff --git a/src/mongo/db/common.cpp b/src/mongo/db/common.cpp
index f4a09eb4131..970b8386fde 100644
--- a/src/mongo/db/common.cpp
+++ b/src/mongo/db/common.cpp
@@ -19,8 +19,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//#include "pch.h"
-//#include "concurrency.h"
 #include "jsobjmanipulator.h"
 
 /**
diff --git a/src/mongo/db/compact.cpp b/src/mongo/db/compact.cpp
index a2c7c8ac345..bc47ab0ec26 100644
--- a/src/mongo/db/compact.cpp
+++ b/src/mongo/db/compact.cpp
@@ -20,7 +20,7 @@
 
 #include "pch.h"
 #include "pdfile.h"
-#include "concurrency.h"
+#include "d_concurrency.h"
 #include "commands.h"
 #include "curop-inl.h"
 #include "background.h"
diff --git a/src/mongo/db/concurrency.h b/src/mongo/db/concurrency.h
deleted file mode 100644
index 33bc0caac77..00000000000
--- a/src/mongo/db/concurrency.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// @file concurrency.h
-
-/*
- *    Copyright (C) 2010 10gen Inc.
- *
- *    This program is free software: you can redistribute it and/or  modify
- *    it under the terms of the GNU Affero General Public License, version 3,
- *    as published by the Free Software Foundation.
- *
- *    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
- *    GNU Affero General Public License for more details.
- *
- *    You should have received a copy of the GNU Affero General Public License
- *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "mongomutex.h"
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index f38559484b5..9e335c003a6 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -42,7 +42,7 @@
 #include "restapi.h"
 #include "dbwebserver.h"
 #include "dur.h"
-#include "concurrency.h"
+#include "d_concurrency.h"
 #include "../s/d_writeback.h"
 #include "d_globals.h"
 
diff --git a/src/mongo/db/durop.cpp b/src/mongo/db/durop.cpp
index 39a8e3dc907..dae10f0cbbc 100644
--- a/src/mongo/db/durop.cpp
+++ b/src/mongo/db/durop.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "pch.h"
-#include "concurrency.h"
+#include "d_concurrency.h"
 #include "../util/alignedbuilder.h"
 #include "../util/mongoutils/str.h"
 #include "../util/file.h"
diff --git a/src/mongo/db/security.h b/src/mongo/db/security.h
index 53b5e0c4f46..df89df047bb 100755
--- a/src/mongo/db/security.h
+++ b/src/mongo/db/security.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include "mongo/db/authlevel.h"
-#include "mongo/db/concurrency.h"
 #include "mongo/db/nonce.h"
 #include "mongo/db/security_common.h"
 #include "mongo/util/concurrency/spin_lock.h"
diff --git a/src/mongo/db/security_common.h b/src/mongo/db/security_common.h
index 80a74506025..b594438c0bd 100644
--- a/src/mongo/db/security_common.h
+++ b/src/mongo/db/security_common.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include "commands.h"
-#include "concurrency.h"
 #include "../util/concurrency/spin_lock.h"
 
 namespace mongo {