Storage Framework

Merge lp:~michihenning/storage-framework/fix-version-typo into lp:storage-framework/devel

  1. fix-version-typo
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: James Henstridge
Approved revision: 28
Merged at revision: 29
Proposed branch: lp:~michihenning/storage-framework/fix-version-typo
Merge into: lp:storage-framework/devel
Diff against target: 12 lines (+1/-1)
1 file modified
include/unity/storage/qt/client/internal/boost_filesystem.h (+1/-1)
To merge this branch: bzr merge lp:~michihenning/storage-framework/fix-version-typo
Reviewer Review Type Date Requested Status
James Henstridge Approve
Review via email: mp+300700@code.launchpad.net

Commit message

Fixed wrong version comparison for boost.

Description of the change

Fixed wrong version comparison for boost.

To post a comment you must log in.
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good!

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

Really, to be safe, this probably should check for version <= 105599, in case there are and 1.55.nn versions kicking around... Are there any?

In hindsight, the previous check was a bit more reliable because it explicitly looked major and minor version number only.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/storage/qt/client/internal/boost_filesystem.h'
2--- include/unity/storage/qt/client/internal/boost_filesystem.h 2016-07-20 01:15:26 +0000
3+++ include/unity/storage/qt/client/internal/boost_filesystem.h 2016-07-21 07:36:30 +0000
4@@ -20,7 +20,7 @@
5
6 #include <boost/version.hpp>
7
8-#if BOOST_VERSION < 105500
9+#if BOOST_VERSION <= 105500
10 #define BOOST_NO_CXX11_SCOPED_ENUMS
11 #include <boost/filesystem.hpp>
12 #undef BOOST_NO_CXX11_SCOPED_ENUMS

Subscribers

People subscribed via source and target branches

to all changes: