From: Gabriel Corona Date: Fri, 27 May 2016 13:28:37 +0000 (+0200) Subject: Merge master branches X-Git-Tag: v3_14~1138^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f08bdbc99e7c2b305bfc7fa82e8dd2b0daeb2591?hp=69d6a6f60276cd03087e8cc6013321e2dee1b314 Merge master branches --- diff --git a/src/simix/ContextRaw.cpp b/src/simix/ContextRaw.cpp index b9bd0fed12..10330cbd09 100644 --- a/src/simix/ContextRaw.cpp +++ b/src/simix/ContextRaw.cpp @@ -43,7 +43,7 @@ public: RawContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_process_t process); - ~RawContext(); + ~RawContext() override; public: static void wrapper(void* arg); void stop() override; @@ -59,7 +59,7 @@ private: class RawContextFactory : public ContextFactory { public: RawContextFactory(); - ~RawContextFactory(); + ~RawContextFactory() override; RawContext* create_context(std::function code, void_pfn_smxprocess_t, smx_process_t process) override; void run_all() override; diff --git a/src/simix/ContextThread.hpp b/src/simix/ContextThread.hpp index abed18789f..77923bf92f 100644 --- a/src/simix/ContextThread.hpp +++ b/src/simix/ContextThread.hpp @@ -24,7 +24,7 @@ public: ThreadContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_process_t process, bool maestro =false); - ~ThreadContext(); + ~ThreadContext() override; void stop() override; void suspend() override; void attach_start() override; @@ -46,8 +46,8 @@ public: class ThreadContextFactory : public ContextFactory { public: ThreadContextFactory(); - ~ThreadContextFactory(); - virtual ThreadContext* create_context(std::function code, + ~ThreadContextFactory() override; + ThreadContext* create_context(std::function code, void_pfn_smxprocess_t cleanup_func, smx_process_t process) override; void run_all() override; ThreadContext* self() override; diff --git a/src/simix/ContextUnix.cpp b/src/simix/ContextUnix.cpp index 3d9e4bbad8..ebdd9b075a 100644 --- a/src/simix/ContextUnix.cpp +++ b/src/simix/ContextUnix.cpp @@ -82,7 +82,7 @@ public: friend UContextFactory; UContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_process_t process); - ~UContext(); + ~UContext() override; }; class SerialUContext : public UContext { @@ -114,8 +114,8 @@ public: friend ParallelUContext; UContextFactory(); - virtual ~UContextFactory(); - virtual Context* create_context(std::function code, + ~UContextFactory() override; + Context* create_context(std::function code, void_pfn_smxprocess_t, smx_process_t process) override; void run_all() override; }; diff --git a/src/simix/SynchroComm.hpp b/src/simix/SynchroComm.hpp index d2c549b376..cd02960bbc 100644 --- a/src/simix/SynchroComm.hpp +++ b/src/simix/SynchroComm.hpp @@ -20,7 +20,7 @@ namespace simgrid { namespace simix { XBT_PUBLIC_CLASS Comm : public Synchro { - ~Comm(); + ~Comm() override; public: Comm(e_smx_comm_type_t type); void suspend() override; diff --git a/src/simix/SynchroExec.hpp b/src/simix/SynchroExec.hpp index 58951ce1b0..b771a39123 100644 --- a/src/simix/SynchroExec.hpp +++ b/src/simix/SynchroExec.hpp @@ -13,7 +13,7 @@ namespace simgrid { namespace simix { XBT_PUBLIC_CLASS Exec : public Synchro { - ~Exec(); + ~Exec() override; public: Exec(const char*name, sg_host_t host); void suspend() override; diff --git a/src/simix/SynchroRaw.hpp b/src/simix/SynchroRaw.hpp index 7086bd32ae..2b62f875f5 100644 --- a/src/simix/SynchroRaw.hpp +++ b/src/simix/SynchroRaw.hpp @@ -15,7 +15,7 @@ namespace simix { /** Used to implement mutexes, semaphores and conditions */ XBT_PUBLIC_CLASS Raw : public Synchro { public: - ~Raw(); + ~Raw() override; void suspend() override; void resume() override; void post() override; diff --git a/tools/cmake/GCCFlags.cmake b/tools/cmake/GCCFlags.cmake index 5f1be60fd2..077e85ad43 100644 --- a/tools/cmake/GCCFlags.cmake +++ b/tools/cmake/GCCFlags.cmake @@ -11,7 +11,7 @@ set(warnCFLAGS "") set(optCFLAGS "") - +set(warnCXXFLAGS "") if(enable_compile_warnings) set(warnCFLAGS "-fno-common -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror") @@ -19,12 +19,12 @@ if(enable_compile_warnings) set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes") endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror") + set(warnCXXFLAGS "${warnCFLAGS} -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror") if(CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wclobbered -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes") + set(warnCXXFLAGS "${warnCXXFLAGS} -Wclobbered -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes") endif() if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # don't care about class that become struct - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-mismatched-tags") + set(warnCXXFLAGS "${warnCXXFLAGS} -Wno-mismatched-tags") endif() set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall") @@ -129,8 +129,8 @@ if(NOT enable_debug) set(CMAKE_CXX_FLAGS "-DNDEBUG ${CMAKE_CXX_FLAGS}") endif() -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${optCFLAGS} ${warnCFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}") +set(CMAKE_C_FLAGS "${warnCFLAGS} ${CMAKE_C_FLAGS} ${optCFLAGS}") +set(CMAKE_CXX_FLAGS "${warnCXXFLAGS} ${CMAKE_CXX_FLAGS} ${optCFLAGS}") # Try to make Mac a bit more complient to open source standards if(CMAKE_SYSTEM_NAME MATCHES "Darwin")