Skip to content

Fix compilation on OSX #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2018
Merged

Fix compilation on OSX #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions cmake/bob.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion ma/maFaceSplit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class FaceSplit
Adapt* getAdapt() {return adapter;}
private:
Adapt* adapter;
bool shouldCollect[4];
EntityArray toSplit[4];
apf::DynamicArray<EntityArray> newEntities[4];
};
Expand Down
2 changes: 1 addition & 1 deletion phasta/phBubble.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion phasta/phRestart.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
5 changes: 3 additions & 2 deletions phasta/phiotimer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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<NUM_PHASTAIO_MODES; chefFile++) {
size_t totalus = 0;
Expand Down