From d464878d65fa533b147076656341fddc49707409 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 27 Mar 2018 07:50:07 -0400
Subject: [PATCH] Use std::vector<>::data() not address of first element

---
 src/effects/nyquist/Nyquist.cpp | 8 ++++----
 src/effects/vamp/VampEffect.cpp | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp
index ce925ffda..fba042235 100644
--- a/src/effects/nyquist/Nyquist.cpp
+++ b/src/effects/nyquist/Nyquist.cpp
@@ -341,7 +341,7 @@ bool NyquistEffect::DefineParams( ShuttleParams & S )
          int x=d;
          //parms.WriteEnum(ctrl.var, (int) d, choices);
          S.DefineEnum( x, static_cast<const wxChar*>( ctrl.var.c_str() ), 0,
-                       &ctrl.choices[0], ctrl.choices.size() );
+                       ctrl.choices.data(), ctrl.choices.size() );
       }
       else if (ctrl.type == NYQ_CTRL_STRING)
       {
@@ -389,7 +389,7 @@ bool NyquistEffect::GetAutomationParameters(CommandParameters & parms)
       {
          // untranslated
          parms.WriteEnum(ctrl.var, (int) d,
-                         &ctrl.choices[0], ctrl.choices.size());
+                         ctrl.choices.data(), ctrl.choices.size());
       }
       else if (ctrl.type == NYQ_CTRL_STRING)
       {
@@ -440,7 +440,7 @@ bool NyquistEffect::SetAutomationParameters(CommandParameters & parms)
          int val;
          // untranslated
          good = parms.ReadEnum(ctrl.var, &val,
-                               &ctrl.choices[0], ctrl.choices.size()) &&
+                               ctrl.choices.data(), ctrl.choices.size()) &&
                 val != wxNOT_FOUND;
       }
       else if (ctrl.type == NYQ_CTRL_STRING)
@@ -481,7 +481,7 @@ bool NyquistEffect::SetAutomationParameters(CommandParameters & parms)
          int val {0};
          // untranslated
          parms.ReadEnum(ctrl.var, &val,
-                        &ctrl.choices[0], ctrl.choices.size());
+                        ctrl.choices.data(), ctrl.choices.size());
          ctrl.val = (double) val;
       }
       else if (ctrl.type == NYQ_CTRL_STRING)
diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp
index 10ea1ceeb..2b3b03b75 100644
--- a/src/effects/vamp/VampEffect.cpp
+++ b/src/effects/vamp/VampEffect.cpp
@@ -193,7 +193,7 @@ bool VampEffect::GetAutomationParameters(CommandParameters & parms)
             choices.push_back(choice);
          }
 
-         parms.WriteEnum(key, val, &choices[0], choices.size());
+         parms.WriteEnum(key, val, choices.data(), choices.size());
       }
       else
       {
@@ -236,7 +236,7 @@ bool VampEffect::SetAutomationParameters(CommandParameters & parms)
             choices.push_back(choice);
          }
 
-         good = parms.ReadEnum(key, &val, &choices[0], choices.size()) && val != wxNOT_FOUND;
+         good = parms.ReadEnum(key, &val, choices.data(), choices.size()) && val != wxNOT_FOUND;
       }
       else
       {
@@ -282,7 +282,7 @@ bool VampEffect::SetAutomationParameters(CommandParameters & parms)
             choices.push_back(choice);
          }
 
-         parms.ReadEnum(key, &val, &choices[0], choices.size());
+         parms.ReadEnum(key, &val, choices.data(), choices.size());
 
          mPlugin->setParameter(mParameters[p].identifier, (float) val);
       }