diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-03-01 18:48:44 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-03-01 18:48:44 +0100 |
commit | 0d26e81ab56f7a945af23034878e0487aa65800f (patch) | |
tree | 2acb54403850d8225d9d445e97ede81fe12c5934 /src/WorldStorage/FastNBT.h | |
parent | Final implementation of MetaRotater (diff) | |
parent | Merge pull request #735 from xdot/master (diff) | |
download | cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.gz cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.bz2 cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.lz cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.xz cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.zst cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.zip |
Diffstat (limited to 'src/WorldStorage/FastNBT.h')
-rw-r--r-- | src/WorldStorage/FastNBT.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/WorldStorage/FastNBT.h b/src/WorldStorage/FastNBT.h index a78b610cb..d68ebd54c 100644 --- a/src/WorldStorage/FastNBT.h +++ b/src/WorldStorage/FastNBT.h @@ -173,13 +173,14 @@ public: { ASSERT(m_Tags[a_Tag].m_Type == TAG_Float); - // Cause a compile-time error if sizeof(int) != sizeof(float) - char Check1[sizeof(int) - sizeof(float) + 1]; // sizeof(int) >= sizeof(float) - char Check2[sizeof(float) - sizeof(int) + 1]; // sizeof(float) >= sizeof(int) + // Cause a compile-time error if sizeof(float) != 4 + // If your platform produces a compiler error here, you'll need to add code that manually decodes 32-bit floats + char Check1[5 - sizeof(float)]; // Fails if sizeof(float) > 4 + char Check2[sizeof(float) - 3]; // Fails if sizeof(float) < 4 UNUSED(Check1); UNUSED(Check2); - int i = GetBEInt(m_Data + m_Tags[a_Tag].m_DataStart); + Int32 i = GetBEInt(m_Data + m_Tags[a_Tag].m_DataStart); float f; memcpy(&f, &i, sizeof(f)); return f; |