- Fixed some more compilation issues
- Added some more information to the licensing section of README.md
This commit is contained in:
@@ -18,39 +18,3 @@
|
||||
|
||||
#include <fennec/fproc/io/common.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
namespace fennec
|
||||
{
|
||||
|
||||
string getcwd() {
|
||||
char cstr[MAX_PATH];
|
||||
if (GetCurrentDirectory(sizeof(str), str) == 0) {
|
||||
return string("");
|
||||
}
|
||||
string result(cstr);
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#include <unistd.h>
|
||||
#include <linux/limits.h>
|
||||
|
||||
namespace fennec
|
||||
{
|
||||
|
||||
string getcwd() {
|
||||
char cstr[PATH_MAX];
|
||||
if (::getcwd(cstr, sizeof(cstr)) == NULL) {
|
||||
return string("");
|
||||
}
|
||||
string result(cstr);
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
@@ -30,83 +30,50 @@
|
||||
|
||||
// Windows does not define ISO C aligned allocation functions
|
||||
#ifdef _WIN32
|
||||
inline void operator delete (void* ptr) noexcept { _aligned_free(ptr); }
|
||||
inline void operator delete[](void* ptr) noexcept { _aligned_free(ptr); }
|
||||
inline void operator delete (void* ptr, fennec::align_t) noexcept { ::_aligned_free(ptr); }
|
||||
inline void operator delete[](void* ptr, fennec::align_t) noexcept { ::_aligned_free(ptr); }
|
||||
inline void operator delete (void* ptr, fennec::size_t, fennec::align_t) noexcept { ::_aligned_free(ptr); }
|
||||
inline void operator delete[](void* ptr, fennec::size_t, fennec::align_t) noexcept { ::_aligned_free(ptr); }
|
||||
inline void operator delete (void* ptr, fennec::align_t, const fennec::nothrow_t&) noexcept { _aligned_free(ptr); }
|
||||
inline void operator delete[](void* ptr, fennec::align_t, const fennec::nothrow_t&) noexcept { _aligned_free(ptr); }
|
||||
void operator delete (void* ptr) noexcept { _aligned_free(ptr); }
|
||||
void operator delete[](void* ptr) noexcept { _aligned_free(ptr); }
|
||||
void operator delete (void* ptr, fennec::align_t) noexcept { ::_aligned_free(ptr); }
|
||||
void operator delete[](void* ptr, fennec::align_t) noexcept { ::_aligned_free(ptr); }
|
||||
void operator delete (void* ptr, fennec::size_t, fennec::align_t) noexcept { ::_aligned_free(ptr); }
|
||||
void operator delete[](void* ptr, fennec::size_t, fennec::align_t) noexcept { ::_aligned_free(ptr); }
|
||||
void operator delete (void* ptr, fennec::align_t, const fennec::nothrow_t&) noexcept { _aligned_free(ptr); }
|
||||
void operator delete[](void* ptr, fennec::align_t, const fennec::nothrow_t&) noexcept { _aligned_free(ptr); }
|
||||
|
||||
inline void* operator new (fennec::size_t size, fennec::align_t align) { return _aligned_malloc(static_cast<size_t>(align), size); }
|
||||
inline void* operator new[](fennec::size_t size, fennec::align_t align) { return _aligned_malloc(static_cast<size_t>(align), size); }
|
||||
inline void* operator new (fennec::size_t size, fennec::align_t align, const fennec::nothrow_t&) { return _aligned_malloc(static_cast<size_t>(align), size); }
|
||||
inline void* operator new[](fennec::size_t size, fennec::align_t align, const fennec::nothrow_t&) { return _aligned_malloc(static_cast<size_t>(align), size); }
|
||||
void* operator new (fennec::size_t size, fennec::align_t align) { return _aligned_malloc(static_cast<size_t>(align), size); }
|
||||
void* operator new[](fennec::size_t size, fennec::align_t align) { return _aligned_malloc(static_cast<size_t>(align), size); }
|
||||
void* operator new (fennec::size_t size, fennec::align_t align, const fennec::nothrow_t&) { return _aligned_malloc(static_cast<size_t>(align), size); }
|
||||
void* operator new[](fennec::size_t size, fennec::align_t align, const fennec::nothrow_t&) { return _aligned_malloc(static_cast<size_t>(align), size); }
|
||||
|
||||
#else
|
||||
|
||||
inline void operator delete (void* ptr) noexcept { ::free(ptr); }
|
||||
inline void operator delete[](void* ptr) noexcept { ::free(ptr); }
|
||||
inline void operator delete (void* ptr, fennec::align_t) noexcept { ::free(ptr); }
|
||||
inline void operator delete[](void* ptr, fennec::align_t) noexcept { ::free(ptr); }
|
||||
inline void operator delete (void* ptr, fennec::size_t, fennec::align_t) noexcept { ::free(ptr); }
|
||||
inline void operator delete[](void* ptr, fennec::size_t, fennec::align_t) noexcept { ::free(ptr); }
|
||||
inline void operator delete (void* ptr, fennec::align_t, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
inline void operator delete[](void* ptr, fennec::align_t, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
void operator delete (void* ptr) noexcept { ::free(ptr); }
|
||||
void operator delete[](void* ptr) noexcept { ::free(ptr); }
|
||||
void operator delete (void* ptr, fennec::align_t) noexcept { ::free(ptr); }
|
||||
void operator delete[](void* ptr, fennec::align_t) noexcept { ::free(ptr); }
|
||||
void operator delete (void* ptr, fennec::size_t, fennec::align_t) noexcept { ::free(ptr); }
|
||||
void operator delete[](void* ptr, fennec::size_t, fennec::align_t) noexcept { ::free(ptr); }
|
||||
void operator delete (void* ptr, fennec::align_t, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
void operator delete[](void* ptr, fennec::align_t, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
|
||||
inline void* operator new (fennec::size_t size, fennec::align_t align) { return ::aligned_alloc(static_cast<fennec::size_t>(align), size); }
|
||||
inline void* operator new[](fennec::size_t size, fennec::align_t align) { return ::aligned_alloc(static_cast<fennec::size_t>(align), size); }
|
||||
inline void* operator new (fennec::size_t size, fennec::align_t align, const fennec::nothrow_t&) { return ::aligned_alloc(static_cast<fennec::size_t>(align), size); }
|
||||
inline void* operator new[](fennec::size_t size, fennec::align_t align, const fennec::nothrow_t&) { return ::aligned_alloc(static_cast<fennec::size_t>(align), size); }
|
||||
void* operator new (fennec::size_t size, fennec::align_t align) { return ::aligned_alloc(static_cast<fennec::size_t>(align), size); }
|
||||
void* operator new[](fennec::size_t size, fennec::align_t align) { return ::aligned_alloc(static_cast<fennec::size_t>(align), size); }
|
||||
void* operator new (fennec::size_t size, fennec::align_t align, const fennec::nothrow_t&) { return ::aligned_alloc(static_cast<fennec::size_t>(align), size); }
|
||||
void* operator new[](fennec::size_t size, fennec::align_t align, const fennec::nothrow_t&) { return ::aligned_alloc(static_cast<fennec::size_t>(align), size); }
|
||||
|
||||
#endif
|
||||
|
||||
// Allocation functions
|
||||
inline void* operator new (fennec::size_t size) { return ::malloc(size); }
|
||||
inline void* operator new[](fennec::size_t size) { return ::malloc(size); }
|
||||
inline void* operator new (fennec::size_t size, const fennec::nothrow_t&) { return ::malloc(size); }
|
||||
inline void* operator new[](fennec::size_t size, const fennec::nothrow_t&) { return ::malloc(size); }
|
||||
void* operator new (fennec::size_t size) { return ::malloc(size); }
|
||||
void* operator new[](fennec::size_t size) { return ::malloc(size); }
|
||||
void* operator new (fennec::size_t size, const fennec::nothrow_t&) { return ::malloc(size); }
|
||||
void* operator new[](fennec::size_t size, const fennec::nothrow_t&) { return ::malloc(size); }
|
||||
|
||||
// Deallocation Functions
|
||||
inline void operator delete (void* ptr, fennec::size_t) noexcept { ::free(ptr); }
|
||||
inline void operator delete[](void* ptr, fennec::size_t) noexcept { ::free(ptr); }
|
||||
inline void operator delete (void* ptr, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
inline void operator delete[](void* ptr, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
inline void operator delete (void* ptr, fennec::size_t, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
inline void operator delete[](void* ptr, fennec::size_t, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
|
||||
|
||||
// Platform specific code
|
||||
#ifdef _WIN32
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
|
||||
namespace fennec
|
||||
{
|
||||
|
||||
size_T pagesize() {
|
||||
SYSTEM_INFO sysInfo;
|
||||
GetSystemInfo(&sysInfo);
|
||||
return sysInfo.dwPageSize;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
namespace fennec
|
||||
{
|
||||
|
||||
size_t pagesize() {
|
||||
return sysconf(_SC_PAGESIZE);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
void operator delete (void* ptr, fennec::size_t) noexcept { ::free(ptr); }
|
||||
void operator delete[](void* ptr, fennec::size_t) noexcept { ::free(ptr); }
|
||||
void operator delete (void* ptr, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
void operator delete[](void* ptr, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
void operator delete (void* ptr, fennec::size_t, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
void operator delete[](void* ptr, fennec::size_t, const fennec::nothrow_t&) noexcept { ::free(ptr); }
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user