merge with latest linux changes

Author: hohong

.gitignore

@@ -1,4 +1,7 @@
 #Visual Studio files
+*.o
+*.d
+*.so
 *.[Oo]bj
 *.user
 *.aps
@@ -38,3 +41,4 @@ obj/
 *.resfiles
 [Bb]in
 Binaries/
+Intermediate/

Build/Common.Build.settings

@@ -35,9 +35,7 @@
   <!-- paths can be overridden by configuration -->
   <PropertyGroup>
     <OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
-    <!-- $(Configuration) below is added to place Debug/Release Casablanca bits into different folders when compiled in razzle.
-         It does not affect NativeCloud build, because environment.casablanca.settings overrides OutDir unconditionally -->
-    <OutDir>$(OutputPath)$(Configuration)</OutDir>
+    <OutDir>$(OutputPath)</OutDir>
     <MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)'==''">$(BuildRoot)\Build\MSBuild.Community.Tasks</MSBuildCommunityTasksPath>
     <WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\Build\Wix\3.6\</WixToolPath>
     <WixExtDir Condition="'$(WixExtDir)'==''">$(WixToolPath)</WixExtDir>

Release/Makefile

@@ -5,7 +5,7 @@ bad:
 
 #CXX=clang
 #CXX=/usr/lib/gcc-snapshot/bin/g++
-CXX=g++-4.7
+CXX=g++-4.8
 export CXX
 
 mk_out_dir:
@@ -16,7 +16,7 @@ release: MODE = Release$(shell getconf LONG_BIT)
 release: OUTPUT_DIR = $(PWD)/../Binaries/$(MODE)
 release: mk_out_dir tests samples
 
-debug: OPTIMIZATION_LEVEL = -O0 -ggdb
+debug: OPTIMIZATION_LEVEL = -O0 -g -gdwarf-2
 debug: MODE = Debug$(shell getconf LONG_BIT)
 debug: OUTPUT_DIR = $(PWD)/../Binaries/$(MODE)
 debug: mk_out_dir tests samples
@@ -29,7 +29,7 @@ clean: DOUTPUT_DIR = $(PWD)/../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
+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
@@ -77,7 +77,7 @@ clean:
 	@find . -iname *.o -exec rm '{}' \;
 	@find ../Binaries -iname *.so -exec rm '{}' \;
 	@find ../Binaries -iname *.txt -exec rm '{}' \;
-	@find ../Binaries -iname blackjackclient -exec rm '{}' \;
-	@find ../Binaries -iname blackjackserver -exec rm '{}' \;
+	@find ../Binaries -iname SearchFile -exec rm '{}' \;
+	@find ../Binaries -iname BingRequest -exec rm '{}' \;
 	@find ../Binaries -iname syncdir -exec rm '{}' \;
 	@find ../Binaries -iname test_runner -exec rm '{}' \;

Release/casablanca110.sln

@@ -25,8 +25,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "streams110_test", "tests\Fu
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Uri110_test", "tests\Functional\uri\VS11\Uri110_test.vcxproj", "{3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testlistener110", "tests\Functional\http\utilities\testlistener\VS11\testlistener110.vcxproj", "{5614BAFA-7605-41D3-945F-7EEB8116398F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca110.winrt", "src\build\casablanca110.winrt.vcxproj", "{198ED804-2655-4D92-8104-C220E3EA9452}"
 EndProject
 Global
@@ -256,18 +254,6 @@ Global
 		{3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}.Release|Win32.Build.0 = Release|Win32
 		{3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}.Release|x64.ActiveCfg = Release|x64
 		{3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}.Release|x64.Build.0 = Release|x64
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|ARM.ActiveCfg = Debug|ARM
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|ARM.Build.0 = Debug|ARM
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|Win32.Build.0 = Debug|Win32
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|x64.ActiveCfg = Debug|x64
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|x64.Build.0 = Debug|x64
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|ARM.ActiveCfg = Release|ARM
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|ARM.Build.0 = Release|ARM
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|Win32.ActiveCfg = Release|Win32
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|Win32.Build.0 = Release|Win32
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|x64.ActiveCfg = Release|x64
-		{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|x64.Build.0 = Release|x64
 		{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|ARM.ActiveCfg = Debug|ARM
 		{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|ARM.Build.0 = Debug|ARM
 		{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|Win32.ActiveCfg = Debug|Win32

Release/include/compat/SafeInt3.hpp

@@ -81,6 +81,8 @@ Version 3.0
 // Various things needed for GCC
 #if defined __GNUC__
 
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+
 #define NEEDS_INT_DEFINED
 
 #if !defined NULL

Release/include/cpprest/http_client_impl.h

@@ -44,6 +44,7 @@ using namespace concurrency;
 #else
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
+#include <boost/asio/ssl.hpp>
 #include <boost/algorithm/string.hpp>
 #include <pplx/threadpool.h>
 #endif

Release/tests/Functional/http/utilities/testlistener/stdafx.cpp renamed to Release/include/cpprest/version.h

@@ -1,4 +1,3 @@
-
 /***
 * ==++==
 *
@@ -15,9 +14,9 @@
 * limitations under the License.
 *
 * ==--==
-* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-**/
-// stdafx.cpp : 
-// Include the standard header and generate the precompiled header.
+*/
+#define CPPREST_VERSION_REVISION 0
+#define CPPREST_VERSION_MINOR 1
+#define CPPREST_VERSION_MAJOR 1
 
-#include "stdafx.h"
+#define CPPREST_VERSION (CPPREST_VERSION_MAJOR*100000+CPPREST_VERSION_MINOR*100+CPPREST_VERSION_REVISION)

Release/samples/BingRequest/Makefile

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

Release/samples/SearchFile/Makefile

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

Release/src/Makefile

@@ -63,8 +63,6 @@ CXXFLAGS = -fPIC -std=c++11 $(STRICT_BASE_CXXFLAGS) -I../include -I./pch $(WARNI
 LIBS = $(PKGCONFIG_LIBS) -lboost_system -lboost_thread -lboost_locale -pthread -lstdc++ -lm # these are explicit for clang
 LDFLAGS = $(BASE_LDFLAGS)
 
-CXX ?= g++-4.7
-
 ifeq ($(OUTPUT_DIR),)
   LIBRARY_DST=$(MODE)/$(LIBRARY)
 else