From 8c3bd25825dc3b87976e9dc0f9d3f5004680c7ea Mon Sep 17 00:00:00 2001 From: Jeff Date: Thu, 1 Feb 2018 17:10:47 -0500 Subject: [PATCH] fix on os x --- Makefile | 2 +- llarp/buffer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bc0150fb3..b2a5bb5a2 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ ifneq ($(GIT_VERSION),"") endif REQUIRED_CFLAGS = $(LIBUV_FLAGS) $(SODIUM_FLAGS) -I$(REPO)/include -std=c99 $(CFLAGS) $(DEBUG_FLAGS) $(VER_FLAGS) -Wall -fPIC -REQUIRED_CXXFLAGS = $(LIBUV_FLAGS) $(SODIUM_FLAGS) -I$(REPO)/include -std=c++17 $(CXXFLAGS) $(DEBUG_FLAGS) $(VER_FLAGS) -Wall -fPIC +REQUIRED_CXXFLAGS = $(LIBUV_FLAGS) $(SODIUM_FLAGS) -I$(REPO)/include -std=c++14 $(CXXFLAGS) $(DEBUG_FLAGS) $(VER_FLAGS) -Wall -fPIC LIB_LDFLAGS = -ljemalloc $(SODIUM_LIBS) $(LIBUV_LIBS) -lm -lstdc++ REQUIRED_LDFLAGS = -L$(REPO) -lllarp TEST_LDFLAGS = $(STATIC_LIB) $(LIB_LDFLAGS) diff --git a/llarp/buffer.cpp b/llarp/buffer.cpp index 03611a679..438002377 100644 --- a/llarp/buffer.cpp +++ b/llarp/buffer.cpp @@ -4,7 +4,7 @@ extern "C" { size_t llarp_buffer_size_left(llarp_buffer_t *buff) { - std::ptrdiff_t diff = buff->cur - buff->base; + auto diff = buff->cur - buff->base; if (diff < 0) { return 0; } else if (diff > buff->sz)