projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prefer std::make_shared().
[pulseview.git]
/
pv
/
popups
/
channels.cpp
diff --git
a/pv/popups/channels.cpp
b/pv/popups/channels.cpp
index 23204e855306d436419d201bde7693b71b650e82..9c200b9db31eb5d1c6a3e35cafcc85b1ec2cdbbf 100644
(file)
--- a/
pv/popups/channels.cpp
+++ b/
pv/popups/channels.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 <map>
*/
#include <map>
@@
-52,6
+51,7
@@
using std::map;
using std::mutex;
using std::set;
using std::shared_ptr;
using std::mutex;
using std::set;
using std::shared_ptr;
+using std::make_shared;
using std::unordered_set;
using std::vector;
using std::unordered_set;
using std::vector;
@@
-166,7
+166,7
@@
void Channels::populate_group(shared_ptr<ChannelGroup> group,
// popup.
shared_ptr<Device> binding;
if (group)
// popup.
shared_ptr<Device> binding;
if (group)
- binding =
shared_ptr<Device>(new Device(group)
);
+ binding =
make_shared<Device>(group
);
// Create a title if the group is going to have any content
if ((!sigs.empty() || (binding && !binding->properties().empty())) &&
// Create a title if the group is going to have any content
if ((!sigs.empty() || (binding && !binding->properties().empty())) &&