summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2016-06-16 15:35:59 -0700
committerMartin Braun <martin.braun@ettus.com>2016-06-17 11:27:53 -0700
commit56e987d41cf8468291d3f680a4ac10fead22095e (patch)
tree85e2e82a8b73b0b13c37f4ecf29faee0e468da48
parentOctoclock: Fix off by one errors in uart code (diff)
downloaduhd-56e987d41cf8468291d3f680a4ac10fead22095e.tar.xz
uhd-56e987d41cf8468291d3f680a4ac10fead22095e.zip
convert: remove duplicate registration of sc12 size
-rw-r--r--host/lib/convert/convert_impl.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/host/lib/convert/convert_impl.cpp b/host/lib/convert/convert_impl.cpp
index d90bb9c94..7dfbb33fd 100644
--- a/host/lib/convert/convert_impl.cpp
+++ b/host/lib/convert/convert_impl.cpp
@@ -1,5 +1,5 @@
//
-// Copyright 2011 Ettus Research LLC
+// Copyright 2011,2016 Ettus Research LLC
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -162,7 +162,6 @@ UHD_STATIC_BLOCK(convert_register_item_sizes){
convert::register_bytes_per_item("sc64", sizeof(std::complex<boost::int64_t>));
convert::register_bytes_per_item("sc32", sizeof(std::complex<boost::int32_t>));
convert::register_bytes_per_item("sc16", sizeof(std::complex<boost::int16_t>));
- convert::register_bytes_per_item("sc12", 3 * sizeof(std::complex<boost::int8_t>));
convert::register_bytes_per_item("sc8", sizeof(std::complex<boost::int8_t>));
//register standard real types