projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify get_samples() semantics for AnalogSegment and LogicSegment
[pulseview.git]
/
pv
/
data
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index fe29aea4f0175ba1f9878560ebb3ef4cad66eb8c..9ba8f2c3d6e1a70ed761f88ea57d27dfff9d38a8 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <cassert>
*/
#include <cassert>
@@
-38,7
+37,7
@@
Logic::Logic(unsigned int num_channels) :
assert(num_channels_ > 0);
}
assert(num_channels_ > 0);
}
-
int Logic::get_
num_channels() const
+
unsigned int Logic::
num_channels() const
{
return num_channels_;
}
{
return num_channels_;
}
@@
-65,7
+64,7
@@
void Logic::clear()
segments_.clear();
}
segments_.clear();
}
-uint64_t Logic::
get_
max_sample_count() const
+uint64_t Logic::max_sample_count() const
{
uint64_t l = 0;
for (std::shared_ptr<LogicSegment> s : segments_) {
{
uint64_t l = 0;
for (std::shared_ptr<LogicSegment> s : segments_) {