From 88a815b7dd492913a1e18be3a57ce1b42ee504ed Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Thu, 14 Jun 2018 08:06:57 +0200 Subject: [PATCH] Remove C++11 which also simplifies Windows port --- src/decompositionMethods/decomposeReconstruct/Make/options | 2 +- .../reconstructTools/finiteVolume/sharedPoints.H | 7 ++++--- wmake/rules/mingwGcc/c++ | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/decompositionMethods/decomposeReconstruct/Make/options b/src/decompositionMethods/decomposeReconstruct/Make/options index b3c50eb2e..ae23f0a53 100644 --- a/src/decompositionMethods/decomposeReconstruct/Make/options +++ b/src/decompositionMethods/decomposeReconstruct/Make/options @@ -1,4 +1,4 @@ -EXE_INC = -std=c++11 \ +EXE_INC = \ -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H index a0babafb9..555931114 100644 --- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H +++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H @@ -96,10 +96,10 @@ class sharedPoints // Private Member Functions //- Disallow default bitwise copy construct - sharedPoints(const sharedPoints&) = delete; + sharedPoints(const sharedPoints&); //- Disallow default bitwise assignment - void operator=(const sharedPoints&) = delete; + void operator=(const sharedPoints&); //- Calculate processor patch pairs @@ -127,7 +127,8 @@ public: //- Destructor - ~sharedPoints() = default; + ~sharedPoints() + {} // Member Functions diff --git a/wmake/rules/mingwGcc/c++ b/wmake/rules/mingwGcc/c++ index 67c6c510a..47f8200f7 100644 --- a/wmake/rules/mingwGcc/c++ +++ b/wmake/rules/mingwGcc/c++ @@ -9,7 +9,7 @@ include $(RULES)/c++$(WM_COMPILE_OPTION) ptFLAGS = -DNoRepository -ftemplate-depth-200 GFLAGS = -DWM_$(WM_PRECISION_OPTION) -DWM_LABEL_SIZE=$(WM_LABEL_SIZE) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -I$(OPENMPI_DIR)/include -I$(WM_THIRD_PARTY_DIR)/packages/system/include -Dmingw -DBIG_ENDIAN=0 -DLITTLE_ENDIAN=1 -DBYTE_ORDER=BIG_ENDIAN -U__STRICT_ANSI__ +c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -I$(OPENMPI_DIR)/include -I$(WM_THIRD_PARTY_DIR)/packages/system/include -Dmingw -DBIG_ENDIAN=0 -DLITTLE_ENDIAN=1 -DBYTE_ORDER=BIG_ENDIAN Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ cxxtoo = $(Ctoo)