diff --git a/cmake/bob.cmake b/cmake/bob.cmake index bbe6bc822..e7f7b7fc8 100644 --- a/cmake/bob.cmake +++ b/cmake/bob.cmake @@ -58,10 +58,7 @@ function(bob_begin_cxx_flags) endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (${PROJECT_NAME}_CXX_WARNINGS) - set(FLAGS "${FLAGS} -Werror -Weverything") - set(FLAGS "${FLAGS} -Wno-padded") - set(FLAGS "${FLAGS} -Wno-float-equal") - set(FLAGS "${FLAGS} -Wno-weak-template-vtables") + set(FLAGS "${FLAGS} -Werror -Wall -Wextra") endif() elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") if (${PROJECT_NAME}_CXX_WARNINGS) diff --git a/ma/maFaceSplit.h b/ma/maFaceSplit.h index e1c7e4a35..b69f8bb59 100644 --- a/ma/maFaceSplit.h +++ b/ma/maFaceSplit.h @@ -41,7 +41,6 @@ class FaceSplit Adapt* getAdapt() {return adapter;} private: Adapt* adapter; - bool shouldCollect[4]; EntityArray toSplit[4]; apf::DynamicArray newEntities[4]; }; diff --git a/phasta/phBubble.cc b/phasta/phBubble.cc index 2f89c28f4..6628d544e 100644 --- a/phasta/phBubble.cc +++ b/phasta/phBubble.cc @@ -22,7 +22,7 @@ void readBubbles(Bubbles& bubbles, std::string bubbleFileName) FILE *filebubble; Bubble readbubble; - sprintf(bubblefname,bubbleFileName.c_str()); + sprintf(bubblefname, "%s", bubbleFileName.c_str()); if (!PCU_Comm_Self()) printf("reading bubbles info from %s\n",bubblefname); diff --git a/phasta/phRestart.cc b/phasta/phRestart.cc index 813cfc6c3..a52187136 100644 --- a/phasta/phRestart.cc +++ b/phasta/phRestart.cc @@ -381,7 +381,7 @@ void readAndAttachFields(Input& in, apf::Mesh* m) { } int swap = ph_should_swap(f); /* stops when ph_read_field returns 0 */ - while( readAndAttachField(in,f,m,swap) ); + while( readAndAttachField(in,f,m,swap) ) {} PHASTAIO_CLOSETIME(fclose(f);) double t1 = PCU_Time(); if (!PCU_Comm_Self()) diff --git a/phasta/phiotimer.cc b/phasta/phiotimer.cc index 6916ab331..a0bc29932 100644 --- a/phasta/phiotimer.cc +++ b/phasta/phiotimer.cc @@ -142,7 +142,7 @@ static void printMinMaxAvgSzt(const char* key, size_t v) { double avg = ((double)tot)/PCU_Comm_Peers(); if(!PCU_Comm_Self()) fprintf(stderr, "%s_%s min max avg %" PRIu64 " %" PRIu64 " %f\n", - getFileName(), key, min, max, avg); + getFileName(), key, (long long)min, (long long)max, avg); } static void printMinMaxAvgDbl(const char* key, double v) { @@ -214,7 +214,8 @@ void phastaio_printStats() { usleep(us); phastaio_time(&t1); elapsed = phastaio_time_diff(&t0,&t1); - fprintf(stderr, "%" PRIu64 " us measured as %" PRIu64 " us\n", us, elapsed); + fprintf(stderr, "%" PRIu64 " us measured as %" PRIu64 " us\n", + (long long)us, (long long)elapsed); } for(int chefFile=0; chefFile