Merge lp:~stolowski/unity-scopes-api/fix-includes-trunk into lp:unity-scopes-api

Proposed by Paweł Stołowski
Status: Superseded
Proposed branch: lp:~stolowski/unity-scopes-api/fix-includes-trunk
Merge into: lp:unity-scopes-api
Diff against target: 11 lines (+2/-0)
1 file modified
include/unity/scopes/testing/MockScope.h (+2/-0)
To merge this branch: bzr merge lp:~stolowski/unity-scopes-api/fix-includes-trunk
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
Review via email: mp+303244@code.launchpad.net

Commit message

Added missing includes as apparently g++ is more picky now

Description of the change

Added missing includes as apparently g++ is more picky now

To post a comment you must log in.
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Ack

review: Approve
Revision history for this message
Michi Henning (michihenning) wrote :

I've manually merged this into devel because without this fix, other things can't make it through CI.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/scopes/testing/MockScope.h'
2--- include/unity/scopes/testing/MockScope.h 2015-05-29 10:17:42 +0000
3+++ include/unity/scopes/testing/MockScope.h 2016-08-18 11:31:27 +0000
4@@ -19,6 +19,8 @@
5 #pragma once
6
7 #include <unity/scopes/Scope.h>
8+#include <unity/scopes/SearchMetadata.h>
9+#include <unity/scopes/ActionMetadata.h>
10
11 #include <unity/scopes/testing/MockObject.h>
12

Subscribers

People subscribed via source and target branches

to all changes: