Commit c0e7ee4e by Maarten L. Hekkelman

small stuff

parent c143a722
Version 5.1.1 Version 5.1.1
- Added missing include <compare> in symmetry.hpp - Added missing include <compare> in symmetry.hpp
- Added empty() to matrix
Version 5.1 Version 5.1
- New parser, optimised for speed - New parser, optimised for speed
......
...@@ -47,6 +47,8 @@ class matrix_expression ...@@ -47,6 +47,8 @@ class matrix_expression
constexpr uint32_t dim_m() const { return static_cast<const M &>(*this).dim_m(); } constexpr uint32_t dim_m() const { return static_cast<const M &>(*this).dim_m(); }
constexpr uint32_t dim_n() const { return static_cast<const M &>(*this).dim_n(); } constexpr uint32_t dim_n() const { return static_cast<const M &>(*this).dim_n(); }
constexpr bool empty() const { return dim_m() == 0 or dim_n() == 0; }
constexpr auto &operator()(uint32_t i, uint32_t j) constexpr auto &operator()(uint32_t i, uint32_t j)
{ {
return static_cast<M &>(*this).operator()(i, j); return static_cast<M &>(*this).operator()(i, j);
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define STDOUT_FILENO 1 #define STDOUT_FILENO 1
#endif #endif
#if _MSC_VER #if _WIN32
#include <io.h> #include <io.h>
#define isatty _isatty #define isatty _isatty
#else #else
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <sstream> #include <sstream>
#include <thread> #include <thread>
#if not defined(_MSC_VER) #if not defined(_WIN32)
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <termios.h> #include <termios.h>
#endif #endif
...@@ -68,7 +68,7 @@ std::string get_version_nr() ...@@ -68,7 +68,7 @@ std::string get_version_nr()
// -------------------------------------------------------------------- // --------------------------------------------------------------------
#ifdef _MSC_VER #ifdef _WIN32
} }
#include <Windows.h> #include <Windows.h>
#include <libloaderapi.h> #include <libloaderapi.h>
...@@ -411,11 +411,19 @@ struct rsrc_imp ...@@ -411,11 +411,19 @@ struct rsrc_imp
}; };
} // namespace mrsrc } // namespace mrsrc
#if _MSC_VER #if _WIN32
extern "C" CIFPP_EXPORT const mrsrc::rsrc_imp *gResourceIndexDefault[1] = {}; #if __MINGW32__
extern "C" CIFPP_EXPORT const char *gResourceDataDefault[1] = {};
extern "C" CIFPP_EXPORT const char *gResourceNameDefault[1] = {}; extern "C" __attribute__((weak, alias("gResourceIndexDefault"))) const mrsrc::rsrc_imp gResourceIndex[];
extern "C" __attribute__((weak, alias("gResourceDataDefault"))) const char gResourceData[];
extern "C" __attribute__((weak, alias("gResourceNameDefault"))) const char gResourceName[];
#else
extern "C" const mrsrc::rsrc_imp *gResourceIndexDefault[1] = {};
extern "C" const char *gResourceDataDefault[1] = {};
extern "C" const char *gResourceNameDefault[1] = {};
extern "C" const mrsrc::rsrc_imp gResourceIndex[]; extern "C" const mrsrc::rsrc_imp gResourceIndex[];
extern "C" const char gResourceData[]; extern "C" const char gResourceData[];
...@@ -425,6 +433,8 @@ extern "C" const char gResourceName[]; ...@@ -425,6 +433,8 @@ extern "C" const char gResourceName[];
#pragma comment(linker, "/alternatename:gResourceData=gResourceDataDefault") #pragma comment(linker, "/alternatename:gResourceData=gResourceDataDefault")
#pragma comment(linker, "/alternatename:gResourceName=gResourceNameDefault") #pragma comment(linker, "/alternatename:gResourceName=gResourceNameDefault")
#endif
#else #else
extern const __attribute__((weak)) mrsrc::rsrc_imp gResourceIndex[]; extern const __attribute__((weak)) mrsrc::rsrc_imp gResourceIndex[];
extern const __attribute__((weak)) char gResourceData[]; extern const __attribute__((weak)) char gResourceData[];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment