first cut at named traces (unused); copy ctor and assignment op for B…

…SONObj
npmccallum · Feb 15, 2012 · 59e9b72 · 59e9b72
1 parent 57ea070
commit 59e9b72
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
@@ -55,7 +55,8 @@ commonFiles = [ "pch.cpp",
  "util/intrusive_counter.cpp",
  "util/util.cpp",
  "util/file_allocator.cpp",
- "util/assert_util.cpp",
+ "util/assert_util.cpp",
+ "util/trace.cpp",
  "util/log.cpp",
  "util/ramlog.cpp",
  "util/md5main.cpp",

diff --git a/src/mongo/bson/bsonobj.h b/src/mongo/bson/bsonobj.h
@@ -465,6 +465,18 @@ namespace mongo {
  };
 #pragma pack()
 
+ BSONObj(const BSONObj &rO):
+ _objdata(rO._objdata), _holder(rO._holder) {
+ }
+
+ BSONObj &operator=(const BSONObj &rRHS) {
+ if (this != &rRHS) {
+ _objdata = rRHS._objdata;
+ _holder = rRHS._holder;
+ }
+ return *this;
+ }
+
  private:
  const char *_objdata;
  boost::intrusive_ptr< Holder > _holder;

diff --git a/src/mongo/db/pipeline/dependency_tracker.h b/src/mongo/db/pipeline/dependency_tracker.h
@@ -57,7 +57,7 @@ namespace mongo {
 
 }
 
-/* ======================= INLINED IMPLEMENTATIONS ========================== */
+/* ======================= PRIVATE IMPLEMENTATIONS ========================== */
 
 namespace mongo {