Attachment #180846 for bug #216213

View | Details | Raw Unified | Return to bug 216213
Collapse All | Expand All

Lines 3-8 Link Here

(-)Makefile (+7 lines)
3		3
4	PORTNAME= mongodb	4	PORTNAME= mongodb
5	PORTVERSION= 2.6.12	5	PORTVERSION= 2.6.12
		6	PORTREVISION= 1
6	CATEGORIES= databases net	7	CATEGORIES= databases net
7	MASTER_SITES= http://downloads.mongodb.org/src/	8	MASTER_SITES= http://downloads.mongodb.org/src/
8	DISTNAME= ${PORTNAME}-src-r${PORTVERSION}	9	DISTNAME= ${PORTNAME}-src-r${PORTVERSION}
Lines 69-74 Link Here
69	@${REINPLACE_CMD} 's/\["-O3"\]/"${CXXFLAGS}"/' \	70	@${REINPLACE_CMD} 's/\["-O3"\]/"${CXXFLAGS}"/' \
70	${WRKSRC}/SConstruct	71	${WRKSRC}/SConstruct
71		72
		73	post-patch-SSL-on:
		74	.if ${SSL_DEFAULT:Mlibressl*}
		75	@${REINPLACE_CMD} 's/$[ ]$.MONGO_HAVE_FIPS_MODE_SET.*/\1pass/' \
		76	${WRKSRC}/SConstruct
		77	.endif
		78
72	.if ${PORT_OPTIONS:MTEST}	79	.if ${PORT_OPTIONS:MTEST}
73	test: build-depends build	80	test: build-depends build
74	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \	81	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \

Line 0 Link Here

(-)files/patch-src_mongo_client_connpool.h (+11 lines)
	1	--- src/mongo/client/connpool.h.orig 2017-03-15 08:45:26 UTC
	2	+++ src/mongo/client/connpool.h
	3	@@ -323,7 +323,7 @@ namespace mongo {
	4	return _conn;
	5	}
	6
	7	- bool ok() const { return _conn > 0; }
	8	+ bool ok() const { return _conn != nullptr; }
	9
	10	string getHost() const { return _host; }
	11

Line 0 Link Here

(-)files/patch-src_mongo_db_client.h (+10 lines)
	1	--- src/mongo/db/client.h.orig 2017-03-15 08:34:10 UTC
	2	+++ src/mongo/db/client.h
	3	@@ -260,6 +260,6 @@ namespace mongo {
	4	return *c;
	5	}
	6
	7	- inline bool haveClient() { return currentClient.get() > 0; }
	8	+ inline bool haveClient() { return currentClient.get() != nullptr; }
	9
	10	};

Line 0 Link Here

(-)files/patch-src_mongo_db_fts_fts__matcher.cpp (+11 lines)
	1	--- src/mongo/db/fts/fts_matcher.cpp.orig 2017-03-15 08:44:40 UTC
	2	+++ src/mongo/db/fts/fts_matcher.cpp
	3	@@ -128,7 +128,7 @@ namespace mongo {
	4	* @param haystack, raw string to be parsed
	5	*/
	6	bool FTSMatcher::_phraseMatches( const string& phrase, const string& haystack ) const {
	7	- return strcasestr( haystack.c_str(), phrase.c_str() ) > 0;
	8	+ return strcasestr( haystack.c_str(), phrase.c_str() ) != nullptr;
	9	}
	10	}
	11	}

Line 0 Link Here

(-)files/patch-src_mongo_db_structure_catalog_namespace.h (+11 lines)
	1	--- src/mongo/db/structure/catalog/namespace.h.orig 2017-03-15 08:38:13 UTC
	2	+++ src/mongo/db/structure/catalog/namespace.h
	3	@@ -55,7 +55,7 @@ namespace mongo {
	4	bool operator!=(const char *r) const { return strcmp(buf, r) != 0; }
	5	bool operator!=(const Namespace& r) const { return strcmp(buf, r.buf) != 0; }
	6
	7	- bool hasDollarSign() const { return strchr( buf , '$' ) > 0; }
	8	+ bool hasDollarSign() const { return strchr( buf , '$' ) != nullptr; }
	9
	10	int hash() const; // value returned is always > 0
	11

Line 0 Link Here

(-)files/patch-src_mongo_s_d__state.cpp (+11 lines)
	1	--- src/mongo/s/d_state.cpp.orig 2017-03-15 09:17:53 UTC
	2	+++ src/mongo/s/d_state.cpp
	3	@@ -831,7 +831,7 @@ namespace mongo {
	4	if ( ! shardingState.hasVersion( ns ) )
	5	return false;
	6
	7	- return ShardedConnectionInfo::get(false) > 0;
	8	+ return ShardedConnectionInfo::get(false) != nullptr;
	9	}
	10
	11	class UnsetShardingCommand : public MongodShardCommand {

Line 0 Link Here

(-)files/patch-src_mongo_s_shard.h (+11 lines)
	1	--- src/mongo/s/shard.h.orig 2017-03-15 08:45:54 UTC
	2	+++ src/mongo/s/shard.h
	3	@@ -292,7 +292,7 @@ namespace mongo {
	4	_finishedInit = true;
	5	}
	6
	7	- bool ok() const { return _conn > 0; }
	8	+ bool ok() const { return _conn != nullptr; }
	9
	10	/**
	11	this just passes through excpet it checks for stale configs

Return to bug 216213