Skip to content

Commit

Permalink
Merge pull request #107 from NuiCpp/new-warning-fixes
Browse files Browse the repository at this point in the history
New warning fixes
  • Loading branch information
5cript authored Apr 6, 2024
2 parents e4a8146 + 50bc778 commit 0a964f8
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion cmake/dependencies/fmt.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
option(NUI_FETCH_FMT "Fetch fmt" ON)
set(NUI_FMT_GIT_REPOSITORY "https://github.com/fmtlib/fmt.git" CACHE STRING "fmt git repository")
set(NUI_FMT_GIT_TAG "5f774c0aed4af6494b412cd3883e0f09295bd79d" CACHE STRING "fmt git tag")
set(NUI_FMT_GIT_TAG "4e8640ed90ac8751d4a8ca500b893cc8c4bb9668" CACHE STRING "fmt git tag")

if (NUI_FETCH_FMT)
include(FetchContent)
Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies/roar.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
option(NUI_FETCH_ROAR "Fetch roar" ON)
set(NUI_ROAR_REPOSITORY "https://github.com/5cript/roar.git" CACHE STRING "roar repository")
set(NUI_ROAR_TAG "4fe66b20d9d99d1fe2953048a7a6c65ce9a751c7" CACHE STRING "roar tag")
set(NUI_ROAR_TAG "f88b5f46e145376d392c43dc621690f58278582c" CACHE STRING "roar tag")

if(NUI_FETCH_ROAR)
include(FetchContent)
Expand Down
6 changes: 6 additions & 0 deletions nui/include/nui/backend/backend.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#pragma once

#include <nui/backend/filesystem/special_paths.hpp>
#include <nui/backend/filesystem/file_dialog.hpp>
#include <nui/backend/rpc_hub.hpp>
#include <nui/backend/url.hpp>
16 changes: 8 additions & 8 deletions nui/include/nui/frontend/attributes/style.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,33 +156,33 @@ namespace Nui::Attributes
auto operator=(char const* value)
{
return StylePropertyImpl{
[name = std::string{name}, value = std::string{value}]() {
return name + ":" + value;
[name_ = std::string{name}, value = std::string{value}]() {
return name_ + ":" + value;
},
nullptr};
}
auto operator=(std::string value)
{
return StylePropertyImpl{
[name = std::string{name}, value = std::move(value)]() {
return name + ":" + value;
[name_ = std::string{name}, value = std::move(value)]() {
return name_ + ":" + value;
},
nullptr};
}
auto operator=(Observed<std::string>& observedValue)
{
return StylePropertyImpl{
[name = std::string{name}, &observedValue]() {
return name + ":" + observedValue.value();
[name_ = std::string{name}, &observedValue]() {
return name_ + ":" + observedValue.value();
},
observedValue};
}
template <typename FunctionT, typename... ArgsT>
auto operator=(ObservedValueCombinatorWithGenerator<FunctionT, ArgsT...>&& combinator)
{
return StylePropertyImpl{
[name = std::string{name}, gen = combinator.generator()]() {
return name + ":" + gen();
[name_ = std::string{name}, gen = combinator.generator()]() {
return name_ + ":" + gen();
},
std::move(combinator)};
}
Expand Down
4 changes: 2 additions & 2 deletions nui/include/nui/frontend/elements/impl/materialize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ namespace Nui
};
struct Renderer
{
RendererType type;
std::size_t metadata;
RendererType type{RendererType::Append};
std::size_t metadata{0};
};
auto renderElement(Renderer const& gen, auto& element, auto const& htmlElement)
{
Expand Down

0 comments on commit 0a964f8

Please sign in to comment.