Skip to content

Commit

Permalink
Merge pull request #141 from ecmwf/bugfix/fix_warnings
Browse files Browse the repository at this point in the history
Fix compilation warnings on LUMI with cce/17
  • Loading branch information
wdeconinck authored Oct 7, 2024
2 parents 0c7680a + bb478ce commit 19e0ec8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 0 additions & 2 deletions src/eckit/codec/Stream.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ Stream::Stream(DataHandle* datahandle) : shared_(datahandle), ptr_(shared_.get()

Stream::Stream(std::shared_ptr<DataHandle> datahandle) : shared_(datahandle), ptr_(shared_.get()) {}

Stream::Stream(const Stream& other) = default;

DataHandle& Stream::datahandle() {
ASSERT(ptr_ != nullptr);
return *ptr_;
Expand Down
7 changes: 5 additions & 2 deletions src/eckit/codec/Stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ class Stream {
/// the referenced datahandle
Stream(DataHandle&);

/// Assignment constructor sharing datahandle with other Stream
Stream(const Stream&);
/// Assignment/Copy constructor sharing datahandle with other Stream
Stream(const Stream&) = default;
Stream(Stream&&) = default;
Stream& operator=(const Stream&) = default;
Stream& operator=(Stream&&) = default;

/// Access internal DataHandle
DataHandle& datahandle();
Expand Down
2 changes: 1 addition & 1 deletion tests/value/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ foreach( valueType nil boolean integer double string valuemap valuelist date ord
LIBS eckit )
endforeach()

if( CMAKE_CXX_COMPILER_ID MATCHES "Cray" )
if( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
# Disable warnings for test_value_integer due to following:
# "Integer conversion resulted in a change of sign."
set_source_files_properties(test_value_integer.cc PROPERTIES COMPILE_FLAGS "-hmsglevel_4" )
Expand Down

0 comments on commit 19e0ec8

Please sign in to comment.