| 123456789101112131415161718192021222324252627282930313233343536373839404142 |
- $OpenBSD: patch-kernel_driver_info_cc,v 1.1 2017/06/03 14:25:16 espie Exp $
- can't declare functions in the middle of functions in modern C++
- Index: kernel/driver_info.cc
- --- kernel/driver_info.cc.orig
- +++ kernel/driver_info.cc
- @@ -268,6 +268,7 @@ do_scalar_inertial_assignment(driver_info &driver, con
- *************************************************************************
- *************************************************************************/
-
- +inline int do_record_transport_assignment(driver_info &, const record_base &, int, const vtime &);
-
- // Creates transaction composite signals. Returns number of assigned scalars.
- inline int
- @@ -311,7 +312,6 @@ do_array_transport_assignment(driver_info &driver, con
- assigned_scalars += do_array_transport_assignment(driver, (array_base&)value.data[j], i, tr_time);
- break;
- case RECORD:
- - inline int do_record_transport_assignment(driver_info &, const record_base &, int, const vtime &);
- assigned_scalars += do_record_transport_assignment(driver, (record_base&)value.data[j], i, tr_time);
- break;
- }
- @@ -338,6 +338,9 @@ driver_info::transport_assign(const array_base &value,
- }
-
-
- +inline int do_record_inertial_assignment(driver_info &, const record_base &,
- + int, const vtime &, const vtime &);
- +
- // Creates transaction for composite signals. Returns number of assigned scalars.
- inline int
- do_array_inertial_assignment(driver_info &driver,
- @@ -381,8 +384,6 @@ do_array_inertial_assignment(driver_info &driver,
- assigned_scalars += do_array_inertial_assignment(driver, (array_base&)value.data[j], i, tr_time, rm_time);
- break;
- case RECORD:
- - inline int do_record_inertial_assignment(driver_info &, const record_base &, int,
- - const vtime &, const vtime &);
- assigned_scalars += do_record_inertial_assignment(driver, (record_base&)value.data[j], i, tr_time, rm_time);
- break;
- }
|
