Merge branch 'apple' into development

Author: arturl

Release/Makefile

@@ -1,11 +1,21 @@
+TOP ?= $(shell pwd)
+
 SUBDIRS = src tests samples
 
 bad:
 	@echo "Please 'make' one of: release, debug, all, or clean."
 
-#CXX=clang
-#CXX=/usr/lib/gcc-snapshot/bin/g++
-CXX=g++-4.8
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+	UNAME=LINUX
+	CXX=g++-4.8
+endif
+ifeq ($(UNAME_S),Darwin)
+	UNAME=APPLE
+    CXX=clang++	
+endif
+
+export UNAME
 export CXX
 
 mk_out_dir:
@@ -18,45 +28,70 @@ release: mk_out_dir tests samples
 
 debug: OPTIMIZATION_LEVEL = -O0 -g -ggdb
 debug: MODE = Debug$(shell getconf LONG_BIT)
-debug: OUTPUT_DIR = $(PWD)/../Binaries/$(MODE)
+debug: OUTPUT_DIR = $(TOP)/../Binaries/$(MODE)
 debug: mk_out_dir tests samples
 
 clean: RMODE = Release$(shell getconf LONG_BIT)
 clean: DMODE = Debug$(shell getconf LONG_BIT)
-clean: ROUTPUT_DIR = $(PWD)/../Binaries/$(RMODE)
-clean: DOUTPUT_DIR = $(PWD)/../Binaries/$(DMODE)
+clean: ROUTPUT_DIR = $(TOP)/../Binaries/$(RMODE)
+clean: DOUTPUT_DIR = $(TOP)/../Binaries/$(DMODE)
 
 export MODE
 
 WARNINGS=-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code
-SUPPRESSIONS=-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-deprecated -Wno-unused-value -Wno-unused-local-typedefs
 
+ifeq ($(UNAME),LINUX)
+SUPPRESSIONS=-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-deprecated -Wno-unused-value -Wno-unused-local-typedefs
 # C++11 excludes GCC < 4.7, which is desired anyway
 OTHER_OPTIONS=-std=c++11 -fno-strict-aliasing
+endif
+ifeq ($(UNAME),APPLE)
+SUPPRESSIONS=-Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage
+OTHER_OPTIONS=-stdlib=libc++ -std=c++11 -fno-strict-aliasing
+endif
 
 STRICT_BASE_CXXFLAGS=$(OPTIMIZATION_LEVEL) $(OTHER_OPTIONS) $(WARNINGS) $(SUPPRESSIONS) -Werror -pedantic
 export STRICT_BASE_CXXFLAGS
 
 BASE_CXXFLAGS=$(OPTIMIZATION_LEVEL) $(OTHER_OPTIONS) $(WARNINGS) $(SUPPRESSIONS) -Werror
 export BASE_CXXFLAGS
 
-LAX_BASE_CXXFLAGS=$(OPTIMIZATION_LEVEL) $(SUPPRESSIONS) $(OTHER_OPTIONS) -fpermissive
+LAX_BASE_CXXFLAGS=$(OPTIMIZATION_LEVEL) $(SUPPRESSIONS) $(OTHER_OPTIONS) 
 export LAX_BASE_CXXFLAGS
 
-BASE_LDFLAGS=-Wl,-z,defs 
+#Disallows undefined symbols in object files (not supported on MacOS)
+ifeq ($(UNAME),LINUX)
+BASE_LDFLAGS=-Wl,-z,defs
+endif
 export BASE_LDFLAGS
 
 export OUTPUT_DIR
 
-CASABLANCA_INCLUDE_DIR=$(PWD)/include/
+CASABLANCA_INCLUDE_DIR=$(TOP)/include/
 export CASABLANCA_INCLUDE_DIR
 
-CASABLANCA_DIR=$(PWD)/
+CASABLANCA_DIR=$(TOP)/
 export CASABLANCA_DIR
 
-CASABLANCA_TESTS_DIR=$(PWD)/tests
+CASABLANCA_TESTS_DIR=$(TOP)/tests
 export CASABLANCA_TESTS_DIR
 
+# boost libraries: use '-mt' suffix for Apple
+ifeq ($(UNAME),LINUX)
+export BOOST_SYSTEM=boost_system
+export BOOST_THREAD=boost_thread
+export BOOST_LOCALE=boost_locale
+export BOOST_REGEX=boost_regex
+export BOOST_FILE_SYSTEM=boost_filesystem
+endif
+ifeq ($(UNAME),APPLE)
+export BOOST_SYSTEM=boost_system-mt
+export BOOST_THREAD=boost_thread-mt
+export BOOST_LOCALE=boost_locale-mt
+export BOOST_REGEX=boost_regex-mt
+export BOOST_FILE_SYSTEM=boost_filesystem-mt
+endif
+
 tests: src
 samples: src
 

Release/collateral/Samples/BlackJack/BlackJack_Server/messagetypes.h

@@ -169,7 +169,7 @@ struct BJHand
     {
         web::json::value result = web::json::value::object();
         result[STATE] = web::json::value::number(state);
-        result[RESULT] = web::json::value::number(this->result);   
+        result[RESULT] = web::json::value::number(this->result);
         result[BET] = web::json::value::number(bet);
         result[INSURANCE] = web::json::value::number(insurance);
 
@@ -186,7 +186,7 @@ struct BJHand
         else
         {
             int idx = 0;
-            for (auto iter = cards.begin(); iter != cards.end(); ++iter)
+            for (auto iter = cards.begin(); iter != cards.end();)
             {
                 jCards[idx++] = iter->AsJSON();
                 break;

Release/include/cpprest/http_client_impl.h

@@ -341,7 +341,6 @@ namespace web { namespace http { namespace client { namespace details
                 {
                     // First see if client needs to be opened.
                     auto error = open_if_required();
-
                     if (error != S_OK)
                     {
                         // Failed to open
@@ -359,7 +358,7 @@ namespace web { namespace http { namespace client { namespace details
                 unsigned long open_if_required()
                 {
                     unsigned long error = S_OK;
-
+                    
                     if( !m_opened )
                     {
                         pplx::extensibility::scoped_critical_section_t l(m_open_lock);
@@ -368,7 +367,6 @@ namespace web { namespace http { namespace client { namespace details
                         if ( !m_opened )
                         {
                             error = open();
-
                             if (error == S_OK)
                             {
                                 m_opened = true;

Release/include/cpprest/xxpublic.h

@@ -60,6 +60,8 @@ typedef UINT_PTR SOCKET;
 #endif
 #endif
 
+#define UNREACHABLE __assume(0)
+
 // for winhttp.h
 typedef void * HINTERNET;
 

Release/samples/BingRequest/Makefile

@@ -1,2 +1,2 @@
 $(OUTPUT_DIR)/BingRequest: ../../collateral/Samples/BingRequest/bingrequest.cpp 
-	$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -lboost_system -lboost_thread -Wno-sign-compare -Wno-unused-parameter 
+	$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -l$(BOOST_SYSTEM) -l$(BOOST_THREAD) -Wno-sign-compare -Wno-unused-parameter 

Release/samples/BlackJack/BlackJack_Client/Makefile

@@ -2,7 +2,7 @@ $(OUTPUT_DIR)/blackjackclient: blackjackclient
 	cp blackjackclient $@
 
 blackjackclient: ../../../collateral/Samples/BlackJack/BlackJack_Client/BlackJackClient.cpp ../../../collateral/Samples/BlackJack/BlackJack_Client/stdafx.cpp
-	$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) -include ../../../collateral/Samples/BlackJack/BlackJack_Client/stdafx.h $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -I$(shell pkg-config libxml++-2.6 --cflags) -lboost_system -Wno-missing-include-dirs -Wno-unused-parameter -Wno-attributes -Wno-sign-compare -Wno-enum-compare
+	$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) -include ../../../collateral/Samples/BlackJack/BlackJack_Client/stdafx.h $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -l$(BOOST_SYSTEM) -Wno-missing-include-dirs -Wno-unused-parameter -Wno-attributes -Wno-sign-compare -Wno-enum-compare
 
 
 

Release/samples/BlackJack/BlackJack_Server/Makefile

@@ -2,7 +2,7 @@ $(OUTPUT_DIR)/blackjackserver: blackjackserver
 	cp blackjackserver $@
 
 blackjackserver: ../../../collateral/Samples/BlackJack/BlackJack_Server/BlackJack_Server.cpp ../../../collateral/Samples/BlackJack/BlackJack_Server/Dealer.cpp ../../../collateral/Samples/BlackJack/BlackJack_Server/stdafx.cpp ../../../collateral/Samples/BlackJack/BlackJack_Server/Table.cpp
-	$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) -include ../../../collateral/Samples/BlackJack/BlackJack_Server/stdafx.h $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -I$(shell pkg-config libxml++-2.6 --cflags) -lboost_system -Wno-missing-include-dirs -Wno-unused-parameter -Wno-attributes -Wno-sign-compare -Wno-enum-compare
+	$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) -include ../../../collateral/Samples/BlackJack/BlackJack_Server/stdafx.h $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -l$(BOOST_SYSTEM) -Wno-missing-include-dirs -Wno-unused-parameter -Wno-attributes -Wno-sign-compare -Wno-enum-compare
 
 
 

Release/samples/SearchFile/Makefile

@@ -1,2 +1,2 @@
 $(OUTPUT_DIR)/SearchFile: ../../collateral/Samples/SearchFile/searchfile.cpp
-	$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -lboost_system -lboost_thread -Wno-sign-compare -Wno-unused-parameter 
+	$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -l$(BOOST_SYSTEM) -l$(BOOST_THREAD) -Wno-sign-compare -Wno-unused-parameter 

Release/src/Makefile

@@ -4,7 +4,6 @@ SOURCES = \
 	streams/linux/fileio_linux.cpp \
 	json/json.cpp \
 	utilities/asyncrt_utils.cpp \
-	pplx/linux/pplxlinux.cpp \
 	pplx/pplx.cpp \
 	pplx/threadpool.cpp \
 	http/uri/uri.cpp \
@@ -21,6 +20,13 @@ SOURCES = \
 	http/logging/log.cpp \
 	utilities/base64.cpp
 
+ifeq ($(UNAME),APPLE)
+	SOURCES += pplx/apple/pplxapple.cpp
+else
+	SOURCES += pplx/linux/pplxlinux.cpp
+endif
+
+
 HEADERS = \
 	../include/cpprest/astreambuf.h \
 	../include/cpprest/streams.h \
@@ -57,11 +63,16 @@ HEADERS = \
 	../include/cpprest/uri_builder.h \
 	../include/cpprest/uri_parser.h \
 	../include/cpprest/xxpublic.h \
-	../include/compat/linux_compat.h \
 	../include/compat/SafeInt3.hpp \
 	../include/pplx/threadpool.h \
 	../src/pch/stdafx.h
 
+ifeq ($(UNAME),APPLE)
+	HEADERS += ../include/compat/apple_compat.h
+else
+	HEADERS += ../include/compat/linux_compat.h
+endif
+
 PCH = ./pch/stdafx.h
 
 PRECOMPILED_HEADERS = $(addsuffix .gch, $(PCH))
@@ -70,13 +81,22 @@ CPP_DEPENDENCIES = $(addsuffix .d, $(basename $(SOURCES)))
 
 # flags for the C++ compiler
 
-PKGCONFIG_CFLAGS = $(shell pkg-config libxml++-2.6 --cflags) 
+ifeq ($(UNAME),LINUX)
+PKGCONFIG_CFLAGS = $(shell pkg-config libxml++-2.6 --cflags)
 PKGCONFIG_LIBS = $(shell pkg-config libxml++-2.6 --libs) $(shell pkg-config libssl --libs)
+endif
+
+ifeq ($(UNAME),APPLE)
+PLATFORM_FLAGS = -framework CoreFoundation
+endif
+ifeq ($(UNAME),LINUX)
+PLATFORM_FLAGS = -pthread
+endif
 
 #-fpch-deps -MMD not useful with a single monolithic PCH
 
 CXXFLAGS = -fPIC -std=c++11 $(STRICT_BASE_CXXFLAGS) -I../include -I./pch $(WARNINGS) $(PKGCONFIG_CFLAGS)
-LIBS = $(PKGCONFIG_LIBS) -lboost_system -lboost_thread -lboost_locale -lboost_regex -pthread -lstdc++ -lm # these are explicit for clang
+LIBS = $(PKGCONFIG_LIBS) $(PLATFORM_FLAGS) -l$(BOOST_SYSTEM) -l$(BOOST_THREAD) -l$(BOOST_LOCALE) -l$(BOOST_REGEX) -lstdc++ -lm # these are explicit for clang
 LDFLAGS = $(BASE_LDFLAGS)
 
 ifeq ($(OUTPUT_DIR),)