|
 |
6b52aa |
diff -Nur mongodb-src-r2.4.4.orig/src/mongo/db/auth/privilege_set.cpp mongodb-src-r2.4.4/src/mongo/db/auth/privilege_set.cpp
|
|
|
6b52aa |
--- mongodb-src-r2.4.4.orig/src/mongo/db/auth/privilege_set.cpp 2013-06-16 20:57:57.411195496 +0200
|
|
|
6b52aa |
+++ mongodb-src-r2.4.4/src/mongo/db/auth/privilege_set.cpp 2013-06-30 12:37:08.567699530 +0200
|
|
|
6b52aa |
@@ -79,7 +79,7 @@
|
|
|
6b52aa |
resourceSearchList[1] = nsToDatabaseSubstring(desiredPrivilege.getResource());
|
|
|
6b52aa |
|
|
|
6b52aa |
ActionSet unmetRequirements = desiredPrivilege.getActions();
|
|
|
6b52aa |
- for (int i = 0; i < boost::size(resourceSearchList); ++i) {
|
|
|
6b52aa |
+ for (int i = 0; i < static_cast<int>(boost::size(resourceSearchList)); ++i) {
|
|
|
6b52aa |
ResourcePrivilegeCacheEntry* entry = _lookupEntry(resourceSearchList[i]);
|
|
|
6b52aa |
if (NULL == entry)
|
|
|
6b52aa |
continue;
|
|
|
6b52aa |
diff -Nur mongodb-src-r2.4.4.orig/src/mongo/db/cmdline_test.cpp mongodb-src-r2.4.4/src/mongo/db/cmdline_test.cpp
|
|
|
6b52aa |
--- mongodb-src-r2.4.4.orig/src/mongo/db/cmdline_test.cpp 2013-06-16 20:57:57.399197914 +0200
|
|
|
6b52aa |
+++ mongodb-src-r2.4.4/src/mongo/db/cmdline_test.cpp 2013-06-30 12:37:08.571700380 +0200
|
|
|
6b52aa |
@@ -102,7 +102,7 @@
|
|
|
6b52aa |
"--servicePassword",
|
|
|
6b52aa |
"xxxxxxxxxxxxxxxx"
|
|
|
6b52aa |
};
|
|
|
6b52aa |
- ASSERT_EQUALS(boost::size(expected), argc);
|
|
|
6b52aa |
+ ASSERT_EQUALS(static_cast<int>(boost::size(expected)), argc);
|
|
|
6b52aa |
|
|
|
6b52aa |
testCensoringArgv(expected, argv, argc);
|
|
|
6b52aa |
}
|
|
|
6b52aa |
@@ -134,7 +134,7 @@
|
|
|
6b52aa |
"-servicePassword",
|
|
|
6b52aa |
"xxxxxxxxxxxxxxxx"
|
|
|
6b52aa |
};
|
|
|
6b52aa |
- ASSERT_EQUALS(boost::size(expected), argc);
|
|
|
6b52aa |
+ ASSERT_EQUALS(static_cast<int>(boost::size(expected)), argc);
|
|
|
6b52aa |
|
|
|
6b52aa |
testCensoringArgv(expected, argv, argc);
|
|
|
6b52aa |
}
|
|
|
6b52aa |
@@ -183,7 +183,7 @@
|
|
|
6b52aa |
"--servicePassword",
|
|
|
6b52aa |
"<password>"
|
|
|
6b52aa |
};
|
|
|
6b52aa |
- ASSERT_EQUALS(boost::size(expected), argc);
|
|
|
6b52aa |
+ ASSERT_EQUALS(static_cast<int>(boost::size(expected)), argc);
|
|
|
6b52aa |
|
|
|
6b52aa |
testCensoringVector(expected, argv, argc);
|
|
|
6b52aa |
}
|
|
|
6b52aa |
@@ -215,7 +215,7 @@
|
|
|
6b52aa |
"-servicePassword",
|
|
|
6b52aa |
"<password>"
|
|
|
6b52aa |
};
|
|
|
6b52aa |
- ASSERT_EQUALS(boost::size(expected), argc);
|
|
|
6b52aa |
+ ASSERT_EQUALS(static_cast<int>(boost::size(expected)), argc);
|
|
|
6b52aa |
|
|
|
6b52aa |
testCensoringVector(expected, argv, argc);
|
|
|
6b52aa |
}
|