X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=test%2Futil.cpp;h=163bc7ac0ef6471a7f9e5403361161fbb1f6959f;hb=0bd39c0c6fcf31063fca364bfdb23d3d40914ba1;hp=21a32c5ebb3233760beced2a304bfecec5a7367f;hpb=3ccf0f7f5b1b31ac628a983a2becee6f4c4c1507;p=pulseview.git
diff --git a/test/util.cpp b/test/util.cpp
index 21a32c5..163bc7a 100644
--- 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 .
*/
#include
@@ -26,20 +25,22 @@
using namespace pv::util;
using ts = pv::util::Timestamp;
+using std::bind;
+
namespace {
QChar mu = QChar(0x03BC);
pv::util::SIPrefix unspecified = pv::util::SIPrefix::unspecified;
pv::util::SIPrefix yocto = pv::util::SIPrefix::yocto;
pv::util::SIPrefix nano = pv::util::SIPrefix::nano;
- pv::util::SIPrefix micro = pv::util::SIPrefix::micro;
+/* pv::util::SIPrefix micro = pv::util::SIPrefix::micro; // Not currently used */
pv::util::SIPrefix milli = pv::util::SIPrefix::milli;
pv::util::SIPrefix none = pv::util::SIPrefix::none;
pv::util::SIPrefix kilo = pv::util::SIPrefix::kilo;
pv::util::SIPrefix yotta = pv::util::SIPrefix::yotta;
- pv::util::TimeUnit Time = pv::util::TimeUnit::Time;
-}
+/* 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");