From: Erich Keane Date: Tue, 12 Aug 2014 20:25:03 +0000 (-0700) Subject: Makefile to build with c++0x, so we can support compilers old enough to attend 1st... X-Git-Tag: 1.2.0+RC1~2331 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf7910bf2313415044a65bc7bfbcd92f719d2353;p=platform%2Fupstream%2Fiotivity.git Makefile to build with c++0x, so we can support compilers old enough to attend 1st grade Change-Id: Iff0367bf67df7e7fd701e42222fbc068797f3916 --- diff --git a/OCLib/InProcClientWrapper.cpp b/OCLib/InProcClientWrapper.cpp index 6c24be6..f1d5604 100644 --- a/OCLib/InProcClientWrapper.cpp +++ b/OCLib/InProcClientWrapper.cpp @@ -284,7 +284,7 @@ namespace OC { if(uri.back() == '/') { - uri.pop_back(); + uri.resize(uri.size()-1); } ostringstream paramsList; diff --git a/OCTestApps/makefile b/OCTestApps/makefile index 56c00b0..0fb1e5f 100644 --- a/OCTestApps/makefile +++ b/OCTestApps/makefile @@ -1,7 +1,7 @@ CXX=g++ #CXX=clang -lstdc++ -g -CXX_FLAGS=-std=c++11 -Wall -pthread +CXX_FLAGS=-std=c++0x -Wall -pthread CXX_INC=-I../OCProject/include/ -I../OCProject/OCLib/ -I../OCProject/OCLib/OCWrapper/ -I../OCProject/OCLib/OCWrapper/server -I../OCProject/OCLib/OCWrapper/client/ -I../OCProject/csdk/ diff --git a/examples/makefile b/examples/makefile index a1cf459..6f947c7 100644 --- a/examples/makefile +++ b/examples/makefile @@ -6,9 +6,9 @@ CXX := g++ OUT_DIR := $(PWD)/$(BUILD) OBJ_DIR := $(OUT_DIR)/obj -CXX_FLAGS.debug := -g3 -std=c++11 -Wall -pthread +CXX_FLAGS.debug := -g3 -std=c++0x -Wall -pthread -CXX_FLAGS.release := -std=c++11 -Wall -pthread +CXX_FLAGS.release := -std=c++0x -Wall -pthread CXX_INC := -I../include/ CXX_INC += -I./client/ diff --git a/examples/old_tests/OCWrapper/makefile b/examples/old_tests/OCWrapper/makefile index b5c8983..c92998c 100644 --- a/examples/old_tests/OCWrapper/makefile +++ b/examples/old_tests/OCWrapper/makefile @@ -1,5 +1,5 @@ CXX=g++ -CXX_FLAGS=-std=c++11 -Wall -pthread +CXX_FLAGS=-std=c++0x -Wall -pthread final: server client serverApp diff --git a/makefile b/makefile index 1d568e0..7e1374a 100644 --- a/makefile +++ b/makefile @@ -7,9 +7,9 @@ OUT_DIR := $(PWD)/$(BUILD) OBJ_DIR := $(OUT_DIR)/obj SAMPLES_OUT_DIR := $(OUT_DIR)/samples -CXX_FLAGS.debug := -g3 -std=c++11 -Wall -pthread +CXX_FLAGS.debug := -g3 -std=c++0x -Wall -pthread -CXX_FLAGS.release := -std=c++11 -Wall -pthread +CXX_FLAGS.release := -std=c++0x -Wall -pthread CXX_INC := -I./include/ CXX_INC += -I./csdk/stack/include