Skip to content

4x+3x compatibility #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DerThorsten merged 2 commits into from
Nov 25, 2025
Merged

4x+3x compatibility #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c87bd
4x updates
DerThorsten Nov 20, 2025
649ddbe
unify
DerThorsten Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ if(EMSCRIPTEN)
SET(XEUS_JAVASCRIPT_USE_SHARED_XEUS ON)
SET(XEUS_JAVASCRIPT_USE_SHARED_XEUS_JAVASCRIPT OFF)
SET(XEUS_JAVASCRIPT_BUILD_TESTS OFF)


if (EMSCRIPTEN_VERSION VERSION_LESS "4.0.0")
# c-definitions for older emscripten versions
add_compile_definitions(XEUS_JAVASCRIPT_EMSCRIPTEN_OLD)
endif()
endif()


Expand Down
43 changes: 3 additions & 40 deletions include/xeus-javascript/convert_json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ struct BindingType<nl::json> {
}
};

#ifdef XEUS_JAVASCRIPT_EMSCRIPTEN_OLD


template <typename T>
using is_decayed_json = std::is_same<std::decay_t<T>, nl::json>;
Expand All @@ -61,46 +63,7 @@ struct TypeID<T, enable_if_decayed_json<T> > {
}
};






// template <>
// struct TypeID<nl::json> {
// static constexpr TYPEID get() {
// return LightTypeID<val>::get();
// }
// };

// template <>
// struct TypeID<const nl::json> {
// static constexpr TYPEID get() {
// return LightTypeID<val>::get();
// }
// };

// template <>
// struct TypeID< nl::json && > {
// static constexpr TYPEID get() {
// return LightTypeID<val>::get();
// }
// };


// template <>
// struct TypeID<nl::json&> {
// static constexpr TYPEID get() {
// return LightTypeID<val>::get();
// }
// };

// template <>
// struct TypeID<const nl::json&> {
// static constexpr TYPEID get() {
// return LightTypeID<val>::get();
// }
// };
#endif

} // namespace internal
} // namespace emscripten