Skip to content

Commit 8e85db4

Browse files
committed
fable: Rename magic.hpp to xmagic.hpp
This makes it clearer that it should be included after everything else, and if someone sorts the schema commits by accident, this will preserve that.
1 parent 107d756 commit 8e85db4

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

fable/include/fable/schema.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140

141141
// It is important that this include comes after all the other ones,
142142
// so that it has access to ALL the previous definitions.
143-
#include <fable/schema/magic.hpp> // for make_prototype, ...
143+
#include <fable/schema/xmagic.hpp> // for make_prototype, ...
144144

145145
namespace fable {
146146

fable/include/fable/schema/array.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
/**
1919
* \file fable/schema/array.hpp
20-
* \see fable/schema/magic.hpp
20+
* \see fable/schema/xmagic.hpp
2121
* \see fable/schema.hpp
2222
* \see fable/schema_test.cpp
2323
*/
@@ -49,7 +49,7 @@ class Array : public Base<Array<T, P>> {
4949
: Base<Array<T, P>>(JsonType::array, std::move(desc)), prototype_(std::move(prototype)), ptr_(ptr) {}
5050

5151
#if 0
52-
// This is defined in: fable/schema/magic.hpp
52+
// This is defined in: fable/schema/xmagic.hpp
5353
Array(Type* ptr, std::string desc)
5454
: Array(ptr, make_prototype<T>(), std::move(desc)) {}
5555
#endif

fable/include/fable/schema/const.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
/**
1919
* \file fable/schema/const.hpp
20-
* \see fable/schema/magic.hpp
20+
* \see fable/schema/xmagic.hpp
2121
* \see fable/schema/const_test.cpp
2222
* \see fable/schema_test.cpp
2323
*/
@@ -48,7 +48,7 @@ class Const : public Base<Const<T, P>> {
4848
}
4949

5050
#if 0
51-
// This is defined in: fable/schema/magic.hpp
51+
// This is defined in: fable/schema/xmagic.hpp
5252
Const(const T& constant, std::string desc)
5353
: Const(constant, make_prototype<T>(), std::move(desc)) {}
5454
#endif

fable/include/fable/schema/map.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class Map : public Base<Map<T, P>> {
6363
}
6464

6565
#if 0
66-
// This is defined in: fable/schema/magic.hpp
66+
// This is defined in: fable/schema/xmagic.hpp
6767
Map(Type* ptr, std::string desc)
6868
: Map(ptr, make_prototype<T>(), std::move(desc)) {}
6969
#endif

fable/include/fable/schema/optional.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class Optional : public Base<Optional<T, P>> {
4848
}
4949

5050
#if 0
51-
// This is defined in: fable/schema/magic.hpp
51+
// This is defined in: fable/schema/xmagic.hpp
5252
Optional(Type* ptr, std::string desc)
5353
: Optional(ptr, make_prototype<T>(), std::move(desc)) {}
5454
#endif

fable/include/fable/schema/magic.hpp renamed to fable/include/fable/schema/xmagic.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* SPDX-License-Identifier: Apache-2.0
1717
*/
1818
/**
19-
* \file fable/schema/magic.hpp
19+
* \file fable/schema/xmagic.hpp
2020
* \see fable/schema.hpp
2121
* \see fable/schema_test.cpp
2222
*

0 commit comments

Comments
 (0)