Nux

Merge lp:~bregma/nux/gcc-5 into lp:nux

  1. gcc-5
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 862
Merged at revision: 863
Proposed branch: lp:~bregma/nux/gcc-5
Merge into: lp:nux
Diff against target: 13 lines (+2/-0)
1 file modified
tests/Helpers.cpp (+2/-0)
To merge this branch: bzr merge lp:~bregma/nux/gcc-5
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Needs Information
Brandon Schaefer (community) Approve
Stephen M. Webb (community) Approve
Review via email: mp+266668@code.launchpad.net

Commit message

fixed a FTBFS when using GCC-5

Description of the change

Fix a FTBFS when using GCC-5.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Self-approving to get the ci-train silo landed.

review: Approve
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Just for the hell of it +1 from a different person

review: Approve
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Builds fine here even without this branch. You sure we need this?

review: Needs Information

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/Helpers.cpp'
--- tests/Helpers.cpp 2012-10-28 15:46:28 +0000
+++ tests/Helpers.cpp 2015-08-02 14:28:52 +0000
@@ -25,7 +25,9 @@
25#include "NuxCore/LoggingWriter.h"25#include "NuxCore/LoggingWriter.h"
2626
27#include <fstream>27#include <fstream>
28#include <iostream>
28#include <stdexcept>29#include <stdexcept>
30#include <string>
2931
30namespace nux32namespace nux
31{33{

Subscribers

People subscribed via source and target branches