Merge pull request #1232 from norihiro-w/fix-small

Fix compiler warnings

Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp

@@ -182,7 +182,7 @@ int NetCdfConfigureDialog::setVariableSelect()
 void NetCdfConfigureDialog::setDimensionSelect()
 {
     int const dim (_currentVar->num_dims());
-    std::array<QComboBox*,4> dim_box = { comboBoxDim1, comboBoxDim2, comboBoxDim3, comboBoxDim4 };
+    std::array<QComboBox*,4> dim_box = {{ comboBoxDim1, comboBoxDim2, comboBoxDim3, comboBoxDim4 }};
 
     for (std::size_t i=0; i<4; ++i)
     {

MaterialsLib/Adsorption/CMakeLists.txt

-file(GLOB Adsorption_SOURCES *.cpp)
-file(GLOB Adsorption_HEADERS *.h)
-
-add_library(MaterialsLibAdsorption ${Adsorption_HEADERS} ${Adsorption_SOURCES} )

MaterialsLib/CMakeLists.txt

 # Source files
-GET_SOURCE_FILES(SOURCES_MATERIALSLIB)
+GET_SOURCE_FILES(SOURCES)
+GET_SOURCE_FILES(SOURCES_ADSORPTION Adsorption)
+set(SOURCES ${SOURCES} ${SOURCES_ADSORPTION})
 
-add_subdirectory( Adsorption )
-
-add_library(MaterialsLib ${SOURCES_MATERIALSLIB} )
+add_library(MaterialsLib ${SOURCES} )

ProcessLib/CMakeLists.txt

@@ -13,7 +13,7 @@ add_library(ProcessLib ${SOURCES})
 
 target_link_libraries(ProcessLib
     AssemblerLib
-    MaterialsLibAdsorption
+    MaterialsLib
     MeshGeoToolsLib
     NumLib # for shape matrices
     ${VTK_LIBRARIES}

ProcessLib/TES/TESOGS5MaterialModels.h

@@ -120,7 +120,7 @@ struct FluidViscosityH2O
         H[2] = 0.6366564;
         H[3] = -0.241605;
 
-        double h[6][7] = {0.0};
+        double h[6][7] = {{0.0}};
         h[0][0] = 0.520094000;
         h[1][0] = 0.085089500;
         h[2][0] = -1.083740000;