unity-scopes-shell

Merge lp:~stolowski/unity-scopes-shell/fix-yakkety-ftbfs into lp:unity-scopes-shell

  1. fix-yakkety-ftbfs
  2. Merge into trunk
Proposed by Paweł Stołowski on 2016-05-23
Status: Merged
Approved by: Marcus Tomlinson on 2016-05-23
Approved revision: 317
Merged at revision: 316
Proposed branch: lp:~stolowski/unity-scopes-shell/fix-yakkety-ftbfs
Merge into: lp:unity-scopes-shell
Diff against target: 23 lines (+2/-0)
2 files modified
src/scope-harness/matcher/scope-uri.cpp (+1/-0)
src/scope-harness/matcher/settings-option-matcher.cpp (+1/-0)
To merge this branch: bzr merge lp:~stolowski/unity-scopes-shell/fix-yakkety-ftbfs
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) 2016-05-23 Approve on 2016-05-23
PS Jenkins bot continuous-integration Pending
Review via email: mp+295459@code.launchpad.net

Commit Message

Fix includes.

Description of the Change

Fix includes.

To post a comment you must log in.
Marcus Tomlinson (marcustomlinson) wrote :

Ack

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/scope-harness/matcher/scope-uri.cpp'
2--- src/scope-harness/matcher/scope-uri.cpp 2015-08-19 13:19:22 +0000
3+++ src/scope-harness/matcher/scope-uri.cpp 2016-05-23 12:06:57 +0000
4@@ -21,6 +21,7 @@
5 #include <QUrl>
6
7 #include <sstream>
8+#include <vector>
9
10 using namespace std;
11
12
13=== modified file 'src/scope-harness/matcher/settings-option-matcher.cpp'
14--- src/scope-harness/matcher/settings-option-matcher.cpp 2015-05-20 14:15:00 +0000
15+++ src/scope-harness/matcher/settings-option-matcher.cpp 2016-05-23 12:06:57 +0000
16@@ -18,6 +18,7 @@
17
18 #include <scope-harness/matcher/settings-option-matcher.h>
19 #include <boost/optional.hpp>
20+#include <cmath>
21
22 using namespace std;
23 using namespace boost;

Subscribers

People subscribed via source and target branches

to all changes: