From 884ddffb7de2bae320099ee7a6eb490b0b2ad9f1 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Tue, 13 Feb 2018 10:46:53 +0100
Subject: [PATCH] fix(General): replace make_unique by makeUnique (avoid
 mistakes)

---
 include/linphone/utils/general.h | 2 +-
 src/db/session/db-session.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linphone/utils/general.h b/include/linphone/utils/general.h
index 6d393aec9..5ca37dde4 100644
--- a/include/linphone/utils/general.h
+++ b/include/linphone/utils/general.h
@@ -106,7 +106,7 @@ constexpr unsigned int makeVersion (unsigned int major, unsigned int minor, unsi
 
 // Not available in C++11...
 template<typename T, typename... Args>
-std::unique_ptr<T> make_unique(Args && ...args) {
+std::unique_ptr<T> makeUnique(Args && ...args) {
 	return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
 }
 
diff --git a/src/db/session/db-session.cpp b/src/db/session/db-session.cpp
index 6c2fda1cc..5a38a73c3 100644
--- a/src/db/session/db-session.cpp
+++ b/src/db/session/db-session.cpp
@@ -34,7 +34,7 @@ DbSession::DbSession (const string &uri) : DbSession() {
 	#ifdef SOCI_ENABLED
 		try {
 			L_D();
-			d->backendSession = make_unique<soci::session>(uri);
+			d->backendSession = makeUnique<soci::session>(uri);
 			d->backend = !uri.find("mysql") ? DbSessionPrivate::Backend::Mysql : DbSessionPrivate::Backend::Sqlite3;
 		} catch (const exception &e) {
 			lWarning() << "Unable to build db session with uri: " << e.what();