diff options
| -rw-r--r-- | src/mongo/db/common.cpp | 38 | ||||
| -rw-r--r-- | src/mongo/db/instance.cpp | 1 | ||||
| -rw-r--r-- | src/mongo/db/jsobj.cpp | 1 | ||||
| -rw-r--r-- | src/mongo/db/pdfile.h | 1 | ||||
| -rw-r--r-- | src/mongo/dbtests/jsobjtests.cpp | 1 |
5 files changed, 1 insertions, 41 deletions
diff --git a/src/mongo/db/common.cpp b/src/mongo/db/common.cpp deleted file mode 100644 index 1cfddcc88f6..00000000000 --- a/src/mongo/db/common.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/** @file common.cpp - Common code for server binaries (mongos, mongod, test). - Nothing used by driver should be here. - */ - -/* - * 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/>. - * - * 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 GNU Affero General 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. - */ - -#include "mongo/db/jsobjmanipulator.h" - -/** - * this just has globals - */ diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp index 80ba1e95a44..b081f1d7906 100644 --- a/src/mongo/db/instance.cpp +++ b/src/mongo/db/instance.cpp @@ -57,6 +57,7 @@ #include "mongo/db/dur_recover.h" #include "mongo/db/instance.h" #include "mongo/db/introspect.h" +#include "mongo/db/jsobjmanipulator.h" #include "mongo/db/json.h" #include "mongo/db/kill_current_op.h" #include "mongo/db/lasterror.h" diff --git a/src/mongo/db/jsobj.cpp b/src/mongo/db/jsobj.cpp index 73ef893f525..02a8ebd6549 100644 --- a/src/mongo/db/jsobj.cpp +++ b/src/mongo/db/jsobj.cpp @@ -30,7 +30,6 @@ #include "mongo/bson/bson_validate.h" #include "mongo/bson/oid.h" #include "mongo/bson/util/atomic_int.h" -#include "mongo/db/jsobjmanipulator.h" #include "mongo/db/json.h" #include "mongo/bson/optime.h" #include "mongo/platform/float_utils.h" diff --git a/src/mongo/db/pdfile.h b/src/mongo/db/pdfile.h index eb3fff529d3..ad79a8f59ff 100644 --- a/src/mongo/db/pdfile.h +++ b/src/mongo/db/pdfile.h @@ -40,7 +40,6 @@ #include "mongo/db/client.h" #include "mongo/db/catalog/database.h" #include "mongo/db/diskloc.h" -#include "mongo/db/jsobjmanipulator.h" #include "mongo/db/storage/data_file.h" #include "mongo/db/storage/durable_mapped_file.h" #include "mongo/db/storage/extent.h" diff --git a/src/mongo/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp index 0fb7739ee38..edada4bd770 100644 --- a/src/mongo/dbtests/jsobjtests.cpp +++ b/src/mongo/dbtests/jsobjtests.cpp @@ -33,7 +33,6 @@ #include "mongo/bson/util/builder.h" #include "mongo/db/jsobj.h" -#include "mongo/db/jsobjmanipulator.h" #include "mongo/db/json.h" #include "mongo/db/structure/btree/key.h" #include "mongo/dbtests/dbtests.h" |