masterConn in DBClientPaired

erh · erh · commit eb9efb78c7e9 · 2010-07-01T10:22:40.000-04:00
Conflicts:

	client/dbclient.h
diff --git a/client/dbclient.cpp b/client/dbclient.cpp
@@ -932,6 +932,10 @@ namespace mongo {
         return master == Left ? left : right;
     }
 
+    DBClientConnection& DBClientPaired::masterConn(){
+        return checkMaster();
+    }
+
     DBClientConnection& DBClientPaired::slaveConn(){
         DBClientConnection& m = checkMaster();
         assert( ! m.isFailed() );
diff --git a/client/dbclient.h b/client/dbclient.h
@@ -909,6 +909,7 @@ namespace mongo {
             return left.getServerAddress() + "," + right.getServerAddress();
         }
 
+        DBClientConnection& masterConn();
         DBClientConnection& slaveConn();
 
         /* TODO - not yet implemented. mongos may need these. */

Original file line number	Diff line number	Diff line change
`@@ -909,6 +909,7 @@ namespace mongo {`
`909`	`909`	`return left.getServerAddress() + "," + right.getServerAddress();`
`910`	`910`	`}`
`911`	`911`
	`912`	`+ DBClientConnection& masterConn();`
`912`	`913`	`DBClientConnection& slaveConn();`
`913`	`914`
`914`	`915`	`/* TODO - not yet implemented. mongos may need these. */`