Merge pull request #51 from Forceflow/develop

Develop

Author: Forceflow

README.md

@@ -1,4 +1,4 @@
-# Libmorton v0.2.4
+# Libmorton v0.2.5
 [![Build Status](https://travis-ci.org/Forceflow/libmorton.svg?branch=master)](https://travis-ci.org/Forceflow/libmorton) [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/forceflow)
 
  * Libmorton is a **C++ header-only library** with methods to efficiently encode/decode 64, 32 and 16-bit Morton codes and coordinates, in 2D and 3D. *Morton order* is also known as *Z-order* or *[the Z-order curve](https://en.wikipedia.org/wiki/Z-order_curve)*.

libmorton/include/morton.h

@@ -77,7 +77,7 @@ namespace libmorton {
 	inline void morton3D_64_decode(const uint_fast64_t morton, uint_fast32_t& x, uint_fast32_t& y, uint_fast32_t& z) {
 		m3D_d_BITALG<uint_fast64_t, uint_fast32_t>(morton, x, y, z);
 	}
-#elif defined(__BMI2__) || __AVX2__
+#elif defined(__BMI2__) || defined(__AVX2__)
 	inline void morton2D_32_decode(const uint_fast32_t morton, uint_fast16_t& x, uint_fast16_t& y) {
 		m2D_d_BMI<uint_fast32_t, uint_fast16_t>(morton, x, y);
 	}

libmorton/include/morton_BMI.h

@@ -1,5 +1,5 @@
 #pragma once
-#if defined(__BMI2__) || __AVX2__
+#if defined(__BMI2__) || defined(__AVX2__)
 #include <immintrin.h>
 #include <stdint.h>
 

libmorton/include/morton_common.h

@@ -3,14 +3,14 @@
 // Libmorton - Common helper methods needed in Morton encoding/decoding
 
 #include <stdint.h>
-#if _MSC_VER
+#if defined(_MSC_VER)
 #include <intrin.h>
 #endif
 
 namespace libmorton {
 	template<typename morton>
 	inline bool findFirstSetBitZeroIdx(const morton x, unsigned long* firstbit_location) {
-#if _MSC_VER && !_WIN64
+#if defined(_MSC_VER) && !defined(_WIN64)
 		// 32 BIT on 32 BIT
 		if (sizeof(morton) <= 4) {
 			return _BitScanReverse(firstbit_location, x) != 0;
@@ -24,10 +24,10 @@ namespace libmorton {
 			}
 			return _BitScanReverse(firstbit_location, (x & 0xFFFFFFFF)) != 0;
 		}
-#elif  _MSC_VER && _WIN64
+#elif defined(_MSC_VER) && defined(_WIN64)
 		// 32 or 64 BIT on 64 BIT
 		return _BitScanReverse64(firstbit_location, x) != 0;
-#elif __GNUC__
+#elif defined(__GNUC__)
 		if (x == 0) {
 			return false;
 		}

test/libmorton_test.cpp

@@ -93,14 +93,14 @@ void parseProgramParameters(int argc, char* argv[]) {
 void printHeader(){
 	cout << "LIBMORTON TEST SUITE" << endl;
 	cout << "--------------------" << endl;
-#if _WIN64 || __x86_64__  
+#if defined(_WIN64) || defined(__x86_64__)
 	cout << "++ 64-bit version" << endl;
 #else
 	cout << "++ 32-bit version" << endl;
 #endif
-#if _MSC_VER
+#if defined(_MSC_VER)
 	cout << "++ Compiled using MSVC " << _MSC_VER << endl;
-#elif __GNUC__
+#elif defined(__GNUC__)
     cout << "++ Compiled using GCC" << endl;
 #endif
 	cout << "++ Running tests until we've reached " << MAXRUNSIZE << "^3 codes" << endl;

test/timer.h

@@ -4,13 +4,13 @@
 
 #pragma once
 
-#if _MSC_VER
+#if defined(_MSC_VER)
 #include <Windows.h>
-#elif __GNUC__
+#elif defined(__GNUC__)
 #include "time.h"
 #endif
 
-#if _MSC_VER
+#if defined(_MSC_VER)
 struct Timer { 
 	double pc_frequency = 0.0;
 	double elapsed_time_milliseconds = 0.0;