DecodeSignal: Use name of last stacked PD unless the name was changed

[pulseview.git] / test / util.cpp

diff --git a/test/util.cpp b/test/util.cpp
index 9e4a99c39d93cac2d1392bf32cab47ed1c701255..163bc7ac0ef6471a7f9e5403361161fbb1f6959f 100644 (file)
--- a/test/util.cpp
+++ b/test/util.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <boost/test/unit_test.hpp>
@@ -26,6 +25,8 @@
 using namespace pv::util;
 using ts = pv::util::Timestamp;
 
+using std::bind;
+
 namespace {
        QChar mu = QChar(0x03BC);
 
@@ -39,7 +40,7 @@ namespace {
        pv::util::SIPrefix yotta       = pv::util::SIPrefix::yotta;
 
 /*     pv::util::TimeUnit Time = pv::util::TimeUnit::Time; // Not currently used */
-}
+}  // namespace
 
 BOOST_AUTO_TEST_SUITE(UtilTest)
 
@@ -203,7 +204,7 @@ BOOST_AUTO_TEST_CASE(format_time_minutes_test)
 {
        using namespace std::placeholders;
 
-       auto fmt = std::bind(format_time_minutes, _1, _2, true);
+       auto fmt = bind(format_time_minutes, _1, _2, true);
 
        BOOST_CHECK_EQUAL(fmt(ts(    0), 0),    "+0:00");
        BOOST_CHECK_EQUAL(fmt(ts(    1), 0),    "+0:01");