Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift 4.x #121

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Swift 4.x #121

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a21993d
Don't assume that tribool has an implicit bool conversion
brucestephens Jan 9, 2019
bb3bd8a
Avoid deprecated boost endianess include
Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Avoid deprecated boost endianess include 
As of Boost 1.69.0, boost/detail/endian.h is deprecated in favour of
boost/predef/other/endian.h, and BOOST_(LITTLE|BIG)_ENDIAN by
BOOST_ENDIAN_(LITTLE|BIG)_BYTE.

Test-Information:

Unit tests pass on Debian 9

Change-Id: If7076c559a4e35219ff97603f50b80cfbe05b29b
  • Loading branch information
@intosi
Miroslaw Stein authored and intosi committed Jan 22, 2019
commit bb3bd8a32b220b9c1ffd566da00bcd0ba546156c
8 changes: 4 additions & 4 deletions Swiften/Base/Platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010 Isode Limited.
* Copyright (c) 2010-2019 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
Expand Down Expand Up @@ -43,9 +43,9 @@
#endif

// Endianness
#include <boost/detail/endian.hpp>
#if defined(BOOST_LITTLE_ENDIAN)
#include <boost/predef/other/endian.h>
#if defined(BOOST_ENDIAN_LITTLE_BYTE)
#define SWIFTEN_LITTLE_ENDIAN
#elif defined(BOOST_BIG_ENDIAN)
#elif defined(BOOST_ENDIAN_BIG_BYTE)
#define SWIFTEN_BIG_ENDIAN
#endif