unity-scope-click

Merge lp:~mterry/unity-scope-click/missing-iostream into lp:unity-scope-click

  1. missing-iostream
  2. Merge into trunk
Proposed by Michael Terry on 2015-06-16
Status: Merged
Approved by: dobey on 2015-06-16
Approved revision: 327
Merged at revision: 331
Proposed branch: lp:~mterry/unity-scope-click/missing-iostream
Merge into: lp:unity-scope-click
Diff against target: 11 lines (+1/-0)
1 file modified
libclickscope/click/package.cpp (+1/-0)
To merge this branch: bzr merge lp:~mterry/unity-scope-click/missing-iostream
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-06-17
dobey (community) 2015-06-16 Approve on 2015-06-16
Review via email: mp+262035@code.launchpad.net

Commit Message

Add a missing iostream include.

Description of the Change

Add a missing iostream include.

I've uploaded a new libjsoncpp, merged from updates in Debian. But it exposed a bug in unity-scope-click, and it can't migrate from wily-proposed to wily until it is fixed.

Apparently package.cpp was accidentally relying on the libjsoncpp headers including iostream for it.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libclickscope/click/package.cpp'
2--- libclickscope/click/package.cpp 2015-01-20 03:40:54 +0000
3+++ libclickscope/click/package.cpp 2015-06-16 01:33:00 +0000
4@@ -27,6 +27,7 @@
5 * files in the program, then also delete it here.
6 */
7
8+#include <iostream>
9 #include <sstream>
10
11 #include <click/application.h>

Subscribers

People subscribed via source and target branches

to all changes: