Skip to content

Commit

Permalink
remove more boostisms
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Nov 26, 2022
1 parent 496d887 commit 95a6636
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 14 deletions.
7 changes: 1 addition & 6 deletions Engine/Hash64.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
#include "Global/Macros.h"

#include <vector>
#if !defined(Q_MOC_RUN) && !defined(SBK_RUN)
#include <boost/static_assert.hpp>
#endif

#include "Global/GlobalDefines.h"

Expand Down Expand Up @@ -74,9 +71,7 @@ class Hash64
template<typename T>
static U64 toU64(T value)
{
GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF
BOOST_STATIC_ASSERT(sizeof(T) <= 8);
GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
static_assert(sizeof(T) <= 8, "Type too large");
alias_cast_t<T> ac;

ac.data = value;
Expand Down
7 changes: 0 additions & 7 deletions Engine/TrackerContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@
#include <set>
#include <sstream> // stringstream

#if !defined(SBK_RUN) && !defined(Q_MOC_RUN)
GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF
// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef]
#include <boost/bind/bind.hpp>
GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
#endif

CLANG_DIAG_OFF(deprecated)
CLANG_DIAG_OFF(uninitialized)
#include <QtCore/QWaitCondition>
Expand Down
2 changes: 1 addition & 1 deletion Global/GlobalDefines.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#undef isalnum

#if !defined(Q_MOC_RUN) && !defined(SBK_RUN)
#include <boost/cstdint.hpp>
#include <cstdint>
#endif
#include <QtCore/QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Expand Down

0 comments on commit 95a6636

Please sign in to comment.