Skip to content

Commit 4efaa06

Browse files
dav-ogdav-og
authored
Resolve MSVC warnings for cleaner builds (#82)
Address MSVC warnings (C4005, C4018, C4189, C4267) Changes: - Remove conflicting CHRONO_VERSION macro definition in logging.h; add fallback in logger_backend.cpp to avoid conflict with Chrono's ChVersion.h (C4005) - Use Eigen::Index for Eigen container loops instead of int/size_t (C4018) - Use size_t for STL container loops in demos/tests (C4018) - Add explicit casts for size_t-to-int conversions where APIs require int (C4267) - Remove unused variables: rest_length, col_dof, total_dofs, bodies, dampers, samples, width_array (C4189) - Fix variable shadowing: rename t_tau to t_tau_init in ExcitationConvolution - Mark Irrlicht includes as SYSTEM in CMakeLists.txt to suppress warnings Build tested: Release configuration, all (working) regression tests pass.
1 parent 1d81eff commit 4efaa06

35 files changed

Lines changed: 80 additions & 80 deletions

‎CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,14 @@ target_link_libraries(HydroChronoGUI
463463
$<$<BOOL:${HYDROCHRONO_ENABLE_VSG}>:Chrono::Chrono_vsg>
464464
)
465465

466+
# Suppress warnings from third-party Irrlicht headers on MSVC.
467+
# The Irrlicht headers trigger C4458 warnings (x/y hiding member) that we cannot fix.
468+
# Use /external:I to treat Irrlicht includes as external headers with reduced warning level.
469+
if(MSVC AND HYDROCHRONO_ENABLE_IRRLICHT AND DEFINED Irrlicht_ROOT)
470+
target_include_directories(HydroChronoGUI SYSTEM PUBLIC "${Irrlicht_ROOT}/include")
471+
target_compile_options(HydroChronoGUI PRIVATE /external:anglebrackets /external:W0)
472+
endif()
473+
466474
# ===============================================================================
467475
# ------- Auxiliary Targets (app, tests, demos) ---------------------------------
468476
# ===============================================================================

‎demos/DeepCWind/demo_DeepCWind_decay.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ int main(int argc, char* argv[]) {
137137
outputFile.open("./results/DeepCWind_decay.txt");
138138
outputFile << std::left << std::setw(10) << "Time (s)" << std::right << std::setw(16) << "Base Surge (m)"
139139
<< std::right << std::setw(16) << "Base Pitch (radians)" << std::endl;
140-
for (int i = 0; i < time_vector.size(); ++i)
140+
for (size_t i = 0; i < time_vector.size(); ++i)
141141
outputFile << std::left << std::setw(10) << std::setprecision(2) << std::fixed << time_vector[i]
142142
<< std::right << std::setw(16) << std::setprecision(8) << std::fixed << base_surge[i]
143143
<< std::right << std::setw(16) << std::setprecision(8) << std::fixed << base_pitch[i]

‎demos/f3of/demo_F3OF_DT1.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ int main(int argc, char* argv[]) {
202202
<< std::right << std::setw(16) << "Base Pitch (radians)" << std::right << std::setw(16)
203203
<< "Flap Fore Pitch (radians)" << std::right << std::setw(16) << "Flap Aft Pitch (radians)"
204204
<< std::endl;
205-
for (int i = 0; i < time_vector.size(); ++i)
205+
for (size_t i = 0; i < time_vector.size(); ++i)
206206
outputFile << std::left << std::setw(10) << std::setprecision(2) << std::fixed << time_vector[i]
207207
<< std::right << std::setw(16) << std::setprecision(4) << std::fixed << base_surge[i]
208208
<< std::right << std::setw(16) << std::setprecision(4) << std::fixed << base_pitch[i]

‎demos/f3of/demo_F3OF_DT2.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ int main(int argc, char* argv[]) {
208208
<< std::right << std::setw(16) << "Base Pitch (radians)" << std::right << std::setw(16)
209209
<< "Flap Fore Pitch (radians)" << std::right << std::setw(16) << "Flap Aft Pitch (radians)"
210210
<< std::endl;
211-
for (int i = 0; i < time_vector.size(); ++i)
211+
for (size_t i = 0; i < time_vector.size(); ++i)
212212
outputFile << std::left << std::setw(10) << std::setprecision(2) << std::fixed << time_vector[i]
213213
<< std::right << std::setw(16) << std::setprecision(4) << std::fixed << base_surge[i]
214214
<< std::right << std::setw(16) << std::setprecision(4) << std::fixed << base_pitch[i]

‎demos/f3of/demo_F3OF_DT3.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ int main(int argc, char* argv[]) {
203203
<< std::right << std::setw(16) << "Base Pitch (radians)" << std::right << std::setw(16)
204204
<< "Flap Fore Pitch (radians)" << std::right << std::setw(16) << "Flap Aft Pitch (radians)"
205205
<< std::endl;
206-
for (int i = 0; i < time_vector.size(); ++i)
206+
for (size_t i = 0; i < time_vector.size(); ++i)
207207
outputFile << std::left << std::setw(10) << std::setprecision(2) << std::fixed << time_vector[i]
208208
<< std::right << std::setw(16) << std::setprecision(4) << std::fixed << base_surge[i]
209209
<< std::right << std::setw(16) << std::setprecision(4) << std::fixed << base_pitch[i]

‎demos/oswec/demo_oswec_decay.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ int main(int argc, char* argv[]) {
228228
outputFile << std::left << std::setw(10) << "Time (s)" << std::right << std::setw(16)
229229
<< "Flap Rotation y (radians)" << std::right << std::setw(16) << "Flap Rotation y (degrees)"
230230
<< std::endl;
231-
for (int i = 0; i < time_vector.size(); ++i)
231+
for (size_t i = 0; i < time_vector.size(); ++i)
232232
outputFile << std::left << std::setw(10) << std::setprecision(2) << std::fixed << time_vector[i]
233233
<< std::right << std::setw(16) << std::setprecision(4) << std::fixed << flap_rot[i] << std::right
234234
<< std::setw(16) << std::setprecision(4) << std::fixed << flap_rot[i] * 360.0 / 6.28

‎demos/oswec/demo_oswec_reg_waves.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ int main(int argc, char* argv[]) {
262262
outputFile << std::left << std::setw(10) << "Time (s)" << std::right << std::setw(12)
263263
<< "Pitch (rads)"
264264
<< std::endl;
265-
for (int i = 0; i < time_vector.size(); ++i)
265+
for (size_t i = 0; i < time_vector.size(); ++i)
266266
outputFile << std::left << std::setw(10) << std::setprecision(2) << std::fixed << time_vector[i]
267267
<< std::right << std::setw(12) << std::setprecision(4) << std::fixed << flap_rot[i]
268268
<< std::endl;

‎demos/rm3/demo_rm3_decay.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ int main(int argc, char* argv[]) {
166166
std::ofstream outputFile(out_dir + "/decay.txt");
167167
outputFile << std::left << std::setw(10) << "Time (s)" << std::right << std::setw(16) << "Float Heave (m)"
168168
<< std::right << std::setw(16) << "Plate Heave (m)" << std::endl;
169-
for (int i = 0; i < time_vector.size(); ++i)
169+
for (size_t i = 0; i < time_vector.size(); ++i)
170170
outputFile << std::left << std::setw(10) << std::setprecision(2) << std::fixed << time_vector[i]
171171
<< std::right << std::setw(16) << std::setprecision(8) << std::fixed << float_heave_position[i]
172172
<< std::right << std::setw(16) << std::setprecision(8) << std::fixed << plate_heave_position[i]

‎demos/rm3/demo_rm3_reg_waves.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ int main(int argc, char* argv[]) {
180180
outputFile << std::left << std::setw(10) << "Time (s)" << std::right << std::setw(16) << "Float Heave (m)"
181181
<< std::right << std::setw(16) << "Plate Heave (m)" << std::right << std::setw(16)
182182
<< "Float Drift (x) (m)" << std::endl;
183-
for (int i = 0; i < time_vector.size(); ++i)
183+
for (size_t i = 0; i < time_vector.size(); ++i)
184184
outputFile << std::left << std::setw(10) << std::setprecision(2) << std::fixed << time_vector[i]
185185
<< std::right << std::setw(16) << std::setprecision(4) << std::fixed << float_heave_position[i]
186186
<< std::right << std::setw(16) << std::setprecision(4) << std::fixed << plate_heave_position[i]

‎demos/sphere/demo_sphere_decay.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ int main(int argc, char* argv[]) {
133133
//<< std::right << std::setw(18) << "Heave Vel (m/s)"
134134
//<< std::right << std::setw(18) << "Heave Force (N)"
135135
<< std::endl;
136-
for (int i = 0; i < time_vector.size(); ++i)
136+
for (size_t i = 0; i < time_vector.size(); ++i)
137137
outputFile << std::left << std::setw(12) << std::setprecision(6) << std::fixed << time_vector[i]
138138
<< std::right << std::setw(12) << std::setprecision(6) << std::fixed << heave_position[i]
139139
<< std::endl;

0 commit comments

Comments
 (0)