On 04/08/2018 01:03 AM, Anuj Mittal wrote:
> On 04/08/2018 02:58 PM, Armin Kuster wrote:
>
>> diff --git
>> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-mongo-Add-using-std-string.patch
>> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-mongo-Add-using-std-string.patch
>> index e517d53..ad9ff5a 100644
>> ---
>> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-mongo-Add-using-std-string.patch
>> +++
>> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-mongo-Add-using-std-string.patch
>> @@ -18,22 +18,22 @@ Signed-off-by: Khem Raj <raj.k...@gmail.com>
>> src/mongo/util/net/miniwebserver.cpp | 1 +
>> 4 files changed, 5 insertions(+)
>>
>> -diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
>> -index b202e0500b..0255613524 100644
>> ---- a/src/mongo/db/dbwebserver.cpp
>> -+++ b/src/mongo/db/dbwebserver.cpp
>> -@@ -67,6 +67,7 @@ namespace mongo {
>> - using std::map;
>> +Index: git/src/mongo/db/dbwebserver.cpp
>> +===================================================================
>> +--- git.orig/src/mongo/db/dbwebserver.cpp
>> ++++ git/src/mongo/db/dbwebserver.cpp
>> +@@ -68,6 +68,7 @@ using std::map;
>> + using std::string;
>> using std::stringstream;
>> using std::vector;
>> +using std::string;
>>
>> using namespace html;
>>
>> -diff --git a/src/mongo/db/matcher/expression_leaf.cpp
>> b/src/mongo/db/matcher/expression_leaf.cpp
>> -index d562bff141..4d931985e2 100644
>> ---- a/src/mongo/db/matcher/expression_leaf.cpp
>> -+++ b/src/mongo/db/matcher/expression_leaf.cpp
>> +Index: git/src/mongo/db/matcher/expression_leaf.cpp
>> +===================================================================
>> +--- git.orig/src/mongo/db/matcher/expression_leaf.cpp
>> ++++ git/src/mongo/db/matcher/expression_leaf.cpp
>> @@ -44,6 +44,8 @@
>> #include "mongo/stdx/memory.h"
>> #include "mongo/util/mongoutils/str.h"
>> @@ -43,10 +43,10 @@ index d562bff141..4d931985e2 100644
>> namespace mongo {
>>
>> Status LeafMatchExpression::setPath(StringData path) {
>> -diff --git a/src/mongo/db/repl/master_slave.cpp
>> b/src/mongo/db/repl/master_slave.cpp
>> -index 05faad1259..ea25d7151b 100644
>> ---- a/src/mongo/db/repl/master_slave.cpp
>> -+++ b/src/mongo/db/repl/master_slave.cpp
>> +Index: git/src/mongo/db/repl/master_slave.cpp
>> +===================================================================
>> +--- git.orig/src/mongo/db/repl/master_slave.cpp
>> ++++ git/src/mongo/db/repl/master_slave.cpp
>> @@ -78,6 +78,7 @@ using std::endl;
>> using std::max;
>> using std::min;
>> @@ -55,18 +55,15 @@ index 05faad1259..ea25d7151b 100644
>> using std::stringstream;
>> using std::unique_ptr;
>> using std::vector;
>> -diff --git a/src/mongo/util/net/miniwebserver.cpp
>> b/src/mongo/util/net/miniwebserver.cpp
>> -index 5f4165d42f..239720c349 100644
>> ---- a/src/mongo/util/net/miniwebserver.cpp
>> -+++ b/src/mongo/util/net/miniwebserver.cpp
>> -@@ -46,6 +46,7 @@ namespace mongo {
>> -
>> +Index: git/src/mongo/util/net/miniwebserver.cpp
>> +===================================================================
>> +--- git.orig/src/mongo/util/net/miniwebserver.cpp
>> ++++ git/src/mongo/util/net/miniwebserver.cpp
>> +@@ -47,6 +47,7 @@ namespace mongo {
>> using std::shared_ptr;
>> + using std::string;
>> using std::stringstream;
>> +using std::string;
>> using std::vector;
> Looks like this has been fixed upstream and this patch should be removed
> instead.
Thanks for the feed back. v2 shortly.
- armin
>
> Thanks,
> Anuj
>
>>
>> MiniWebServer::MiniWebServer(const string& name, const string& ip, int
>> port, ServiceContext* ctx)
>> ---
>> -2.13.3
>> -
>>
--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
