Skip to content
This repository has been archived by the owner on Nov 27, 2023. It is now read-only.

Fix compiling with gcc-13 #606

Merged
merged 1 commit into from
Oct 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions packages/Utils/src/DTK_ConfigDefs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,8 @@

#include <string>

namespace DataTransferKit
{

Comment on lines -24 to -26
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that we were including <cstdint> inside namespace DataTransferKit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugggg

#include "DTK_Types.h"

#define DTK_MARK_REGION( x ) std::string( "DTK_" ) + x

} // namespace DataTransferKit

#endif // #ifndef DTK_CONFIGDEFS_HPP
6 changes: 2 additions & 4 deletions packages/Utils/src/DTK_Core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ void initKokkos( Args &&... args )
// Kokkos doesn't have a global is_initialized(). However,
// Kokkos::initialize() always initializes the default execution
// space, so it suffices to check whether that was initialized.
const bool kokkosIsInitialized =
Kokkos::DefaultExecutionSpace::impl_is_initialized();
const bool kokkosIsInitialized = Kokkos::is_initialized();

if ( !kokkosIsInitialized )
{
Expand All @@ -45,8 +44,7 @@ void initKokkos( Args &&... args )
}
}

const bool kokkosIsInitialized =
Kokkos::DefaultExecutionSpace::impl_is_initialized();
const bool kokkosIsInitialized = Kokkos::is_initialized();

if ( !kokkosIsInitialized )
throw DataTransferKitException( "At the end of initKokkos, Kokkos"
Expand Down
4 changes: 4 additions & 0 deletions packages/Utils/src/DTK_Types.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#endif
#endif

namespace DataTransferKit {

//! Coordinate typedef.
typedef double Coordinate;

Expand All @@ -32,4 +34,6 @@ typedef int LocalOrdinal;
//! Global ordinal typedef.
typedef long long GlobalOrdinal;

}

#endif // DTK_TYPES_H