You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by cj...@apache.org on 2018/11/17 00:23:26 UTC
[incubator-mxnet] branch master updated: fix the flag (#13293)
This is an automated email from the ASF dual-hosted git repository.
cjolivier01 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 46e870b fix the flag (#13293)
46e870b is described below
commit 46e870bf049907cd788948383a6aab71c9196303
Author: Jake Lee <gs...@gmail.com>
AuthorDate: Fri Nov 16 16:23:12 2018 -0800
fix the flag (#13293)
---
cpp-package/example/Makefile | 2 +-
cpp-package/example/example.mk | 4 ++--
cpp-package/example/feature_extract/Makefile | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cpp-package/example/Makefile b/cpp-package/example/Makefile
index 6b64469..58d4c82 100644
--- a/cpp-package/example/Makefile
+++ b/cpp-package/example/Makefile
@@ -41,7 +41,7 @@ debug: prebuild all
$(CPPEX_EXE):% : %.cpp
- $(CXX) -std=c++0x $(CFLAGS) $(CPPEX_CFLAGS) -o build/$@ $(filter %.cpp %.a, $^) $(CPPEX_EXTRA_LDFLAGS)
+ $(CXX) -std=c++11 $(CFLAGS) $(CPPEX_CFLAGS) -o build/$@ $(filter %.cpp %.a, $^) $(CPPEX_EXTRA_LDFLAGS)
clean:
@rm -rf build
diff --git a/cpp-package/example/example.mk b/cpp-package/example/example.mk
index cb8fec1..ef99d74 100644
--- a/cpp-package/example/example.mk
+++ b/cpp-package/example/example.mk
@@ -30,8 +30,8 @@ cpp-package-example-all: cpp-package-all $(CPPEX_EXE)
build/cpp-package/example/% : cpp-package/example/%.cpp lib/libmxnet.so $(CPP_PACKAGE_OP_H_FILE)
@mkdir -p $(@D)
- $(CXX) -std=c++0x $(CFLAGS) $(CPPEX_CFLAGS) -MM -MT cpp-package/example/$* $< >build/cpp-package/example//$*.d
- $(CXX) -std=c++0x $(CFLAGS) $(CPPEX_CFLAGS) -o $@ $(filter %.cpp %.a, $^) $(LDFLAGS) $(CPPEX_EXTRA_LDFLAGS)
+ $(CXX) -std=c++11 $(CFLAGS) $(CPPEX_CFLAGS) -MM -MT cpp-package/example/$* $< >build/cpp-package/example//$*.d
+ $(CXX) -std=c++11 $(CFLAGS) $(CPPEX_CFLAGS) -o $@ $(filter %.cpp %.a, $^) $(LDFLAGS) $(CPPEX_EXTRA_LDFLAGS)
cpp-package-example-clean:
rm -rf build/cpp-package/example/*
diff --git a/cpp-package/example/feature_extract/Makefile b/cpp-package/example/feature_extract/Makefile
index f598183..193eaa7 100644
--- a/cpp-package/example/feature_extract/Makefile
+++ b/cpp-package/example/feature_extract/Makefile
@@ -27,12 +27,12 @@ LDFLAGS=$(COMMFLAGS) -L ../../../lib -lmxnet $(BLAS) $(CUDA) -lgomp -pthread
all: feature_extract prepare_data_with_opencv
feature_extract: ./feature_extract.cpp
- $(CXX) -c -std=c++0x $(CFLAGS) $^
+ $(CXX) -c -std=c++11 $(CFLAGS) $^
$(CXX) $(basename $@).o -o $@ $(LDFLAGS)
-rm -f $(basename $@).o
prepare_data_with_opencv: ./prepare_data_with_opencv.cpp
- $(CXX) -c -std=c++0x $(OPENCV_CFLAGS) $^
+ $(CXX) -c -std=c++11 $(OPENCV_CFLAGS) $^
$(CXX) $(basename $@).o -o $@ $(OPENCV_LDFLAGS)
-rm -f $(basename $@).o