Skip to content

Commit cb4ee70

Browse files
committed
Fix compilation
1 parent 9d5f0ac commit cb4ee70

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

src/apps/weblib/interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include <span>
44

5-
#include "base/io/log.h"
65
#include "base/conv/auto_json.h"
6+
#include "base/io/log.h"
77

88
#include "interfacejs.h"
99
#include "jscriptcanvas.h"

src/base/conv/auto_json.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ concept Optional =
2929
*val;
3030
};
3131

32-
template <class T> concept Tuple = sizeof(std::tuple_size<T>) > 0;
32+
template <class T> concept Tuple = sizeof(std::tuple_size<T>) != 0;
3333

3434
template <class T>
3535
concept Pair = Tuple<T> && std::tuple_size_v<T> == 2;
@@ -244,7 +244,7 @@ struct JSONObj : JSON
244244

245245
template <class T> inline void JSON::dynamicObj(const T &val) const
246246
{
247-
JSONObj j{json};
247+
JSONObj j{json}; // NOLINT
248248
for (const auto &[k, v] : val) { j(toString(k), v); }
249249
}
250250

src/chart/main/events.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#include <optional>
55

66
#include "base/anim/control.h"
7+
#include "base/conv/auto_json.h"
78
#include "base/geom/line.h"
89
#include "base/geom/rect.h"
9-
#include "base/conv/auto_json.h"
1010
#include "base/util/eventdispatcher.h"
1111

1212
namespace Vizzu

src/chart/options/config.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct ExtractIf<::Anim::Interpolated<T>>
2020
{
2121
using type = T;
2222
constexpr const T &operator()(
23-
const ::Anim::Interpolated<T> &value) const noexcept
23+
const ::Anim::Interpolated<T> &value) const
2424
{
2525
return value.get();
2626
}
@@ -31,7 +31,7 @@ struct ExtractIf<Math::FuzzyBool> {
3131
using type = bool;
3232

3333
constexpr bool operator()(
34-
const Math::FuzzyBool &value) const noexcept
34+
const Math::FuzzyBool &value) const
3535
{
3636
return static_cast<bool>(value);
3737
}

src/chart/options/options.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include "align.h"
1919
#include "autoparam.h"
2020
#include "channels.h"
21-
#include "shapetype.h"
2221
#include "coordsystem.h"
2322
#include "orientation.h"
23+
#include "shapetype.h"
2424
#include "sort.h"
2525

2626
namespace Vizzu::Gen
@@ -76,7 +76,8 @@ class Options
7676
Channel &stackAxis() { return channels.at(stackAxisType()); }
7777

7878
Title title{std::nullopt};
79-
Anim::Interpolated<CoordSystem> coordSystem{CoordSystem::cartesian};
79+
Anim::Interpolated<CoordSystem> coordSystem{
80+
CoordSystem::cartesian};
8081
double angle;
8182
Anim::Interpolated<ShapeType> geometry{ShapeType::rectangle};
8283
Math::FuzzyBool horizontal{true};

test/qtest/chart.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void TestChart::run()
114114
setter->setFilter(Data::Filter());
115115
setter->addSeries(ChannelId::y, "Cat2");
116116
setter->addSeries(ChannelId::color, "Cat2");
117-
setter->setPolar(true);
117+
setter->setCoordSystem(CoordSystem::polar);
118118
setter->setTitle("VIZZU Chart - Phase 2");
119119
chart.getChart().getStyles().title.fontSize = 10;
120120
chart.getChart().getStyles().legend.marker.type =

0 commit comments

Comments
 (0)