From e68463e61597798594611b2bfb2925da00e8d4fb Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 29 七月 2020 10:20:12 +0800
Subject: [PATCH] Merge branch 'master' of https://g/wangzhengquan/shmqueue
---
src/queue/include/array_lock_free_queue.h | 2 +-
Make.defines.macos | 23 +++++++++++++++++------
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Make.defines.macos b/Make.defines.macos
index c36a72a..8a7862d 100755
--- a/Make.defines.macos
+++ b/Make.defines.macos
@@ -3,17 +3,28 @@
# Definitions required in all program directories to compile and link
# C programs using gcc.
-CC=gcc
+CC=g++
COMPILE.c=$(CC) $(CFLAGS) $(CPPFLAGS) -c
LINK.c=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
LDFLAGS=
-LDDIR=-L$(ROOT)/lib
-LDLIBS=$(LDDIR) -lapue $(EXTRALIBS)
-CFLAGS=-ansi -I$(ROOT)/include -std=c++11 -Wall -DMACOS -D_DARWIN_C_SOURCE $(EXTRA)
+LDDIR += -L$(ROOT)/lib
+LDLIBS += $(LDDIR) $(EXTRALIBS)
+INCLUDE += -I. -I./include -I$(ROOT)/include -I$(ROOT)/include/usgcommon
+
+ifeq ($(DEBUG),y)
+ DEBFLAGS = -O -g # "-O" is needed to expand inlines
+else
+ DEBFLAGS = -O2
+endif
+
+CFLAGS=-ansi -mcx16 $(INCLUDE) $(DEBFLAGS) -std=c++11 -Wall -DMACOS -D_DARWIN_C_SOURCE $(EXTRA)
RANLIB=ranlib
AR=ar
AWK=awk
-LIBAPUE=$(ROOT)/lib/libapue.a
# Common temp files to delete from each directory.
-TEMPFILES=core core.* *.o temp.* *.out
+TEMPFILES=core core.* **/*.o temp.* *.out *.a *.so
+
+
+%: %.c
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
diff --git a/src/queue/include/array_lock_free_queue.h b/src/queue/include/array_lock_free_queue.h
index 24a4ec6..233bc6a 100644
--- a/src/queue/include/array_lock_free_queue.h
+++ b/src/queue/include/array_lock_free_queue.h
@@ -311,7 +311,7 @@
{
int currentCount = m_count;
uint32_t currentReadIndex = m_readIndex;
- if (i < 0 || i >= currentCount)
+ if (i >= currentCount)
{
std::cerr << "ArrayLockFreeQueue<ELEM_T, Allocator>::operator[] , Error in array limits: " << i << " is out of range\n";
std::exit(EXIT_FAILURE);
--
Gitblit v1.8.0