Commit bcb1556c authored by Kirill Terekhov's avatar Kirill Terekhov

Reduce visual studio complains

+switch off Octree example - not compiling on windows
parent ab616c05
......@@ -215,6 +215,11 @@ if(USE_AUTODIFF_EXPRESSION_TEMPLATES)
endif()
endif()
if(MSVC)
message("Adding flag for exception handling in Visual Studio that is sometimes missing for some reason")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
endif()
if(MSVC)
if(USE_SOLVER_TRILINOS)
......
......@@ -19,5 +19,5 @@ add_subdirectory(MFD-ES)
endif(USE_AUTODIFF AND USE_SOLVER AND USE_MESH)
#add_subdirectory(OctreeCutcell)
if(USE_MESH AND USE_PARTITIONER)
add_subdirectory(Octree)
#add_subdirectory(Octree)
endif(USE_MESH AND USE_PARTITIONER)
\ No newline at end of file
......@@ -19,7 +19,7 @@ namespace INMOST
sprintf(keyword,"gmvinput"); fwrite(keyword,1,8,file);
sprintf(keyword,"ieee");
if( sizeof(Storage::real) != 8 || sizeof(Storage::integer) != 8 )
sprintf(keyword,"ieeei%ldr%ld",sizeof(Storage::integer),sizeof(Storage::real));
sprintf(keyword,"ieeei%zdr%zd",sizeof(Storage::integer),sizeof(Storage::real));
fwrite(keyword,1,8,file);
sprintf(keyword,"nodev"); fwrite(keyword,1,8,file);
keynum = static_cast<Storage::integer>(NumberOfNodes()); fwrite(&keynum,sizeof(Storage::integer),1,file);
......
......@@ -76,7 +76,7 @@ namespace INMOST
static_cast<INMOST_DATA_ENUM_TYPE>(NumberOfCells()),
static_cast<INMOST_DATA_ENUM_TYPE>(NumberOfSets()),
NumberOfTags()-5, //add counter to skip unwanted tags here SKIPHERE, search by SKIPHERE for additional instructions
m_state,
static_cast<INMOST_DATA_ENUM_TYPE>(m_state),
static_cast<INMOST_DATA_ENUM_TYPE>(GetProcessorRank())
},k;
for(k = 0; k < 9; k++) uconv.write_iValue(out,header[k]);
......
......@@ -263,10 +263,10 @@ safe_output:
}
}
fprintf(f, "CELLS %u %ld\n", NumberOfCells() + NumberOfFaces(), values.size());
fprintf(f, "CELLS %u %zd\n", NumberOfCells() + NumberOfFaces(), values.size());
}
else
fprintf(f, "CELLS %u %ld\n", NumberOfCells(), values.size());
fprintf(f, "CELLS %u %zd\n", NumberOfCells(), values.size());
for(dynarray<Storage::integer,64>::size_type i = 0; i < values.size(); i++)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment