Skip to content

Commit d1e9aa0

Browse files
authored
Merge pull request #48 from Forceflow/develop
Pulling in develop branch: Drop C++11 requirement
2 parents 18f908a + c35214f commit d1e9aa0

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ project(libmorton CXX)
66
option(LIBMORTON_BUILD_TESTS "Build unit tests for libmorton" ON)
77

88
add_library(libmorton INTERFACE)
9-
target_compile_features(libmorton
10-
INTERFACE
11-
cxx_std_11
12-
)
139
target_compile_options(libmorton
1410
INTERFACE
1511
# gcc and clang

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Libmorton v0.2.3
1+
# Libmorton v0.2.4
22
[![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)
33

4-
* Libmorton is a **C++11 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)*.
4+
* 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)*.
55
* Libmorton is a **lightweight and portable** library - the only dependencies are standard C++ headers. Architecture-specific optimizations are available.
66
* More info and some benchmarks in these blogposts: [*Morton encoding*](http://www.forceflow.be/2013/10/07/morton-encodingdecoding-through-bit-interleaving-implementations/), [*Libmorton*](http://www.forceflow.be/2016/01/18/libmorton-a-library-for-morton-order-encoding-decoding/) and [*BMI2 instruction set*](http://www.forceflow.be/2016/11/25/using-the-bmi2-instruction-set-to-encode-decode-morton-codes/)
77

test/makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CXX=g++
2-
CFLAGS=-O3 -m64 -std=c++11 -I ../libmorton/include/
2+
CFLAGS=-O3 -m64 -I ../libmorton/include/
33

44
all: test bmi2 avx512
55

0 commit comments

Comments
 (0)