Skip to content

Commit

Permalink
fix C# warning
Browse files Browse the repository at this point in the history
  • Loading branch information
AviaAv committed Oct 6, 2024
1 parent a39b5af commit 0acabd3
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 5 deletions.
1 change: 1 addition & 0 deletions CMake/external_fastdds.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,4 @@ endfunction()
# Trigger the FastDDS build
get_fastdds()


2 changes: 0 additions & 2 deletions CMake/external_foonathan_memory.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,4 @@ function(get_foonathan_memory)

endfunction()


get_foonathan_memory()

1 change: 0 additions & 1 deletion CMake/external_json.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ endfunction()

# Trigger the build
get_nlohmann_json()

1 change: 0 additions & 1 deletion CMake/windows_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ macro(os_set_flags)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")


set_directory_properties(PROPERTIES DIRECTORY third-party/ COMPILE_OPTIONS "/W0")
set_source_files_properties(third-party/*.* PROPERTIES COMPILE_OPTIONS "/W0")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class AutoCalibratedDevice : CalibratedDevice
internal AutoCalibratedDevice(IntPtr dev)
: base(dev)
{ }
public static AutoCalibratedDevice FromDevice(Device dev)
public static new AutoCalibratedDevice FromDevice(Device dev)
{
object error;
if (NativeMethods.rs2_is_device_extendable_to(dev.Handle, Extension.AutoCalibratedDevice, out error) == 0)
Expand Down

0 comments on commit 0acabd3

Please sign in to comment.