From 65ab34ef1dcb36898a9a15d56e55cb2374dc9146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 13 Oct 2015 18:33:32 -0400
Subject: [PATCH] manager: fix typo and minor constness
Tuleap: #13
Change-Id: I8bc2d5e5b73bfb9461aeaea13ec1923567c64e7d
---
src/manager.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/manager.cpp b/src/manager.cpp
index 3937c06186..f413a6d487 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -266,7 +266,7 @@ Manager::init(const std::string &config_file)
setSipLogLevel();
PJSIP_TRY(pjlib_util_init());
PJSIP_TRY(pjnath_init());
-#undef TRY
+#undef PJSIP_TRY
RING_DBG("pjsip version %s for %s initialized",
pj_get_version(), PJ_OS_NAME);
@@ -2289,7 +2289,7 @@ Manager::getAccountList() const
using std::vector;
using std::string;
- vector<string> account_order(loadAccountOrder());
+ const vector<string> account_order(loadAccountOrder());
// The IP2IP profile should always be available, and first in the list;
// however, it is possible that it was deleted by removeAccounts()
--
GitLab