From 4c23a2d761aa22e117b59f651ad85400e4ad345f Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 16 Mar 2018 20:29:19 -0500 Subject: [PATCH] Change buildinfo namespace to defines Defines better reflects that these are from the defines given for the current file's compile options, not the options used when building the Ox libraries being linked against. --- deps/ox/src/ox/__buildinfo/defines.hpp | 2 +- deps/ox/src/ox/std/byteswap.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/ox/src/ox/__buildinfo/defines.hpp b/deps/ox/src/ox/__buildinfo/defines.hpp index 0571e2f7e..8879b35b6 100644 --- a/deps/ox/src/ox/__buildinfo/defines.hpp +++ b/deps/ox/src/ox/__buildinfo/defines.hpp @@ -8,7 +8,7 @@ #pragma once -namespace ox::buildinfo { +namespace ox::defines { #if defined(OX_USE_STDLIB) constexpr auto UseStdLib = true; diff --git a/deps/ox/src/ox/std/byteswap.hpp b/deps/ox/src/ox/std/byteswap.hpp index 65ccff8dd..4d37f8aac 100644 --- a/deps/ox/src/ox/std/byteswap.hpp +++ b/deps/ox/src/ox/std/byteswap.hpp @@ -72,7 +72,7 @@ constexpr inline uint64_t byteSwap(uint64_t i) { */ template constexpr inline T bigEndianAdapt(T i) { - if constexpr(ox::buildinfo::BigEndian) { + if constexpr(ox::defines::BigEndian) { return byteSwap(i); } else { return i;