Changeset 5646

Timestamp:

Sep 8, 2017 11:16:09 AM (7 years ago)

Author:

ming

Message:

Re #1994 (misc): Fixed various warnings thrown by GCC 6.3. Thanks to Alexander Traud for the info.

Location:

pjproject/trunk

Files:

• pjlib/src/pjlib-test/exception.c (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/alsa_dev.c (modified) (1 diff)
• pjsip-apps/src/samples/pjsua2_demo.cpp (modified) (2 diffs)

pjproject/trunk/pjlib/src/pjlib-test/exception.c

@@ -169 +169 @@
         switch (PJ_GET_EXCEPTION()) {
         case ID_1:
-            if (!rc) rc = -30; break;
+            if (!rc) rc = -30;
+            break;
         case ID_2:
-            if (!rc) rc = 0; break;
+            if (!rc) rc = 0;
+            break;
         default:
             if (!rc) rc = -40;

pjproject/trunk/pjmedia/src/pjmedia-audiodev/alsa_dev.c

@@ -939 +939 @@
 
     if (cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING && af->pb_mixer_name) {
-        int result;
         pj_ssize_t min, max;
         snd_mixer_t *handle;

pjproject/trunk/pjsip-apps/src/samples/pjsua2_demo.cpp

@@ -129 +129 @@
     acc_cfg.sipConfig.authCreds.push_back( AuthCredInfo("digest", "*",
                                                         "test1", 0, "test1") );
-    std::auto_ptr<MyAccount> acc(new MyAccount);
+    std::unique_ptr<MyAccount> acc(new MyAccount);
     acc->create(acc_cfg);
     
@@ -308 +308 @@
     AccountConfig acc_cfg;
     acc_cfg.idUri = "sip:localhost";
-    std::auto_ptr<MyAccount> acc(new MyAccount);
+    std::unique_ptr<MyAccount> acc(new MyAccount);
     acc->create(acc_cfg);