consexpr deletion from string
This commit is contained in:
@@ -16,7 +16,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ windows_x64, ubuntu-24.04, mac_arm ]
|
||||
os: [ windows_x64, ubuntu-latest, mac_arm ]
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -24,13 +24,13 @@ jobs:
|
||||
with:
|
||||
submodules: true
|
||||
- name: Install Vulkan SDK
|
||||
if: matrix.os == 'ubuntu-24.04'
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
uses: humbletim/install-vulkan-sdk@v1.1.1
|
||||
with:
|
||||
version: 1.3.250.1
|
||||
cache: true
|
||||
- name: Install Dev Packages
|
||||
if: matrix.os == 'ubuntu-24.04'
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
run: >
|
||||
sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip zip libcurl4-openssl-dev libfreetype-dev libjpeg-turbo8-dev nasm
|
||||
&& sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin
|
||||
|
||||
@@ -203,7 +203,7 @@ namespace OpenVulkano
|
||||
m_string.size() - end - delimiter.size()) };
|
||||
}
|
||||
|
||||
static inline constexpr int64_t OctToInt(const std::string_view& string)
|
||||
static inline int64_t OctToInt(const std::string_view& string)
|
||||
{
|
||||
int64_t result = 0;
|
||||
for (int i = 0; i < static_cast<int>(string.length()); i++)
|
||||
@@ -226,9 +226,9 @@ namespace OpenVulkano
|
||||
return result;
|
||||
}
|
||||
|
||||
constexpr int64_t OctToInt() const { return OctToInt(m_string); }
|
||||
int64_t OctToInt() const { return OctToInt(m_string); }
|
||||
|
||||
static inline constexpr int64_t HexToInt(const std::string_view& string)
|
||||
static inline int64_t HexToInt(const std::string_view& string)
|
||||
{
|
||||
int64_t result = 0;
|
||||
for (char c: string)
|
||||
@@ -261,7 +261,7 @@ namespace OpenVulkano
|
||||
return result;
|
||||
}
|
||||
|
||||
constexpr int64_t HexToInt() { return HexToInt(m_string); }
|
||||
int64_t HexToInt() { return HexToInt(m_string); }
|
||||
|
||||
static bool IsUrl(const std::string_view& str)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user