From 2227f272a7a0a3e43625cb2d4a2704e1ccb6f893 Mon Sep 17 00:00:00 2001 From: ADAM David Alan Martin Date: Fri, 27 Apr 2018 16:09:09 -0400 Subject: SERVER-32645 Create a shim helper framework. The `MONGO_DECLARE_SHIM`, `MONGO_DEFINE_SHIM`, and `MONGO_REGISTER_SHIM` macros can be used to create specialized types which are customization and auto-registration points for late-binding functions. In some sense they work like weak-symbols; however, they also are useful for tracking dependencies upon shimmed-out implementations. --- src/mongo/dbtests/namespacetests.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/mongo/dbtests/namespacetests.cpp') diff --git a/src/mongo/dbtests/namespacetests.cpp b/src/mongo/dbtests/namespacetests.cpp index 6aa07cb3414..e7723e1bfa4 100644 --- a/src/mongo/dbtests/namespacetests.cpp +++ b/src/mongo/dbtests/namespacetests.cpp @@ -1,6 +1,3 @@ -// namespacetests.cpp : namespace.{h,cpp} unit tests. -// - /** * Copyright (C) 2008-2014 MongoDB Inc. * @@ -550,7 +547,7 @@ public: Lock::DBLock lk(&opCtx, dbName, MODE_X); bool justCreated; - Database* db = dbHolder().openDb(&opCtx, dbName, &justCreated); + Database* db = DatabaseHolder::getDatabaseHolder().openDb(&opCtx, dbName, &justCreated); ASSERT(justCreated); Collection* committedColl; @@ -594,7 +591,7 @@ public: Lock::DBLock lk(&opCtx, dbName, MODE_X); bool justCreated; - Database* db = dbHolder().openDb(&opCtx, dbName, &justCreated); + Database* db = DatabaseHolder::getDatabaseHolder().openDb(&opCtx, dbName, &justCreated); ASSERT(justCreated); { -- cgit v1.2.1