Skip to content

Commit 736c212

Browse files
committed
Resolving some naming conflicts
1 parent f3e074f commit 736c212

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

source/Vectors/TVector.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,8 +669,7 @@ namespace Langulus::Math
669669
///
670670
template<TARGS(V) = 0, Offset...I>
671671
struct TProxyArray : TVector<VT, sizeof...(I), VD> {
672-
LANGULUS(UNINSERTABLE) true;
673-
LANGULUS(REFLECTABLE) false;
672+
LANGULUS(ACT_AS) void;
674673
static_assert(sizeof...(I) > 1, "Invalid proxy array size");
675674
static constexpr bool CTTI_VectorTrait = false;
676675
static constexpr bool CTTI_ProxyArray = true;

source/Vectors/TVector.inl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,13 +1683,13 @@ LANGULUS_DEFINE_CONSTANT(Left, ::Langulus::Axes::Left<>,
16831683
"Axes::Left", "A canonical left vector")
16841684

16851685
LANGULUS_DEFINE_CONSTANT(X, ::Langulus::Axes::X<>,
1686-
"Axes::X", "A canonical X axis")
1686+
"Axes::XAxis", "A canonical X axis")
16871687
LANGULUS_DEFINE_CONSTANT(Y, ::Langulus::Axes::Y<>,
1688-
"Axes::Y", "A canonical Y axis")
1688+
"Axes::YAxis", "A canonical Y axis")
16891689
LANGULUS_DEFINE_CONSTANT(Z, ::Langulus::Axes::Z<>,
1690-
"Axes::Z", "A canonical Z axis")
1690+
"Axes::ZAxis", "A canonical Z axis")
16911691
LANGULUS_DEFINE_CONSTANT(W, ::Langulus::Axes::W<>,
1692-
"Axes::W", "A canonical W axis")
1692+
"Axes::WAxis", "A canonical W axis")
16931693

16941694
LANGULUS_DEFINE_CONSTANT(Origin, ::Langulus::Axes::Origin<>,
16951695
"Origin", "A canonical zero vector")

test/Main.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ using namespace ::Langulus::Math;
2626
/// A mockup of a fraction
2727
struct Fraction : public Flow::Resolvable {
2828
LANGULUS(ABSTRACT) false;
29-
LANGULUS(UNINSERTABLE) false;
3029
LANGULUS_BASES(Resolvable);
3130
Fraction() : Resolvable {this} {}
3231
};

0 commit comments

Comments
 (0)