-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GCC13: patch and fix errors and warnings
* downgrade fmt 10.0.0 -> 9.1.0 * patch raja for stdexcept and cstdlib
- Loading branch information
Julien Fausty
committed
Jul 20, 2023
1 parent
ff57a33
commit 05e2192
Showing
5 changed files
with
49 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
diff --git a/tpl/camp/include/camp/resource/host.hpp b/tpl/camp/include/camp/resource/host.hpp | ||
index c765175..4c12f98 100644 | ||
--- a/tpl/camp/include/camp/resource/host.hpp | ||
+++ b/tpl/camp/include/camp/resource/host.hpp | ||
@@ -11,6 +11,8 @@ http://github.com/llnl/camp | ||
#ifndef __CAMP_HOST_HPP | ||
#define __CAMP_HOST_HPP | ||
|
||
+#include <cstdlib> | ||
+ | ||
#include "camp/resource/event.hpp" | ||
#include "camp/resource/platform.hpp" | ||
|
||
@@ -54,7 +56,7 @@ namespace resources | ||
template <typename T> | ||
T *allocate(size_t n, MemoryAccess = MemoryAccess::Device) | ||
{ | ||
- return (T *)malloc(sizeof(T) * n); | ||
+ return (T *)std::malloc(sizeof(T) * n); | ||
} | ||
void *calloc(size_t size, MemoryAccess = MemoryAccess::Device) | ||
{ | ||
@@ -62,7 +64,7 @@ namespace resources | ||
this->memset(p, 0, size); | ||
return p; | ||
} | ||
- void deallocate(void *p, MemoryAccess = MemoryAccess::Device) { free(p); } | ||
+ void deallocate(void *p, MemoryAccess = MemoryAccess::Device) { std::free(p); } | ||
void memcpy(void *dst, const void *src, size_t size) { std::memcpy(dst, src, size); } | ||
void memset(void *p, int val, size_t size) { std::memset(p, val, size); } | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/tpl/camp/include/camp/resource.hpp b/tpl/camp/include/camp/resource.hpp | ||
index 58df206..05c6031 100644 | ||
--- a/tpl/camp/include/camp/resource.hpp | ||
+++ b/tpl/camp/include/camp/resource.hpp | ||
@@ -15,6 +15,7 @@ http://github.com/llnl/camp | ||
#include <memory> | ||
#include <mutex> | ||
#include <type_traits> | ||
+#include <stdexcept> | ||
|
||
#include "camp/helpers.hpp" | ||
#include "camp/resource/event.hpp" |