Skip to content

Commit

Permalink
Fixed formatting discrepancies
Browse files Browse the repository at this point in the history
  • Loading branch information
@OpenSauce04
OpenSauce04 committed Apr 29, 2024
1 parent b5af143 commit 09196d7
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 119 deletions.
190 changes: 78 additions & 112 deletions src/common/serialization/boost_std_variant.hpp
View file
Expand Up @@ -3,7 +3,7 @@

// MS compatible compilers support #pragma once
#if defined(_MSC_VER)
# pragma once
#pragma once
#endif

/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
Expand All @@ -26,50 +26,40 @@

#include <boost/archive/archive_exception.hpp>

#include <boost/serialization/split_free.hpp>
#include <boost/serialization/serialization.hpp>
#include <boost/serialization/nvp.hpp>
#include <boost/serialization/serialization.hpp>
#include <boost/serialization/split_free.hpp>

namespace boost {
namespace serialization {

template<class Archive>
struct std_variant_save_visitor
{
std_variant_save_visitor(Archive& ar) :
m_ar(ar)
{}
template<class T>
void operator()(T const & value) const
{
template <class Archive>
struct std_variant_save_visitor {
std_variant_save_visitor(Archive& ar) : m_ar(ar) {}
template <class T>
void operator()(T const& value) const {
m_ar << BOOST_SERIALIZATION_NVP(value);
}

private:
Archive & m_ar;
Archive& m_ar;
};


template<class Archive>
struct std_variant_load_visitor
{
std_variant_load_visitor(Archive& ar) :
m_ar(ar)
{}
template<class T>
void operator()(T & value) const
{
template <class Archive>
struct std_variant_load_visitor {
std_variant_load_visitor(Archive& ar) : m_ar(ar) {}
template <class T>
void operator()(T& value) const {
m_ar >> BOOST_SERIALIZATION_NVP(value);
}

private:
Archive & m_ar;
Archive& m_ar;
};

template<class Archive, class ...Types>
void save(
Archive & ar,
std::variant<Types...> const & v,
unsigned int /*version*/
){
template <class Archive, class... Types>
void save(Archive& ar, std::variant<Types...> const& v, unsigned int /*version*/
) {
const std::size_t which = v.index();
ar << BOOST_SERIALIZATION_NVP(which);
std_variant_save_visitor<Archive> visitor(ar);
Expand All @@ -78,45 +68,39 @@ void save(

// Minimalist metaprogramming for handling parameter pack
namespace mp {
namespace detail {
template <typename Seq>
struct front_impl;

template <template <typename...> class Seq, typename T, typename... Ts>
struct front_impl<Seq<T, Ts...>> {
using type = T;
};

template <typename Seq>
struct pop_front_impl;

template <template <typename...> class Seq, typename T, typename... Ts>
struct pop_front_impl<Seq<T, Ts...>> {
using type = Seq<Ts...>;
};
} //namespace detail

template <typename... Ts>
struct typelist {};

template <typename Seq>
using front = typename detail::front_impl<Seq>::type;

template <typename Seq>
using pop_front = typename detail::pop_front_impl<Seq>::type;
} // namespace mp

template<std::size_t N, class Seq>
struct variant_impl
{
template<class Archive, class V>
static void load (
Archive & ar,
std::size_t which,
V & v,
const unsigned int version
){
if(which == 0){
namespace detail {
template <typename Seq>
struct front_impl;

template <template <typename...> class Seq, typename T, typename... Ts>
struct front_impl<Seq<T, Ts...>> {
using type = T;
};

template <typename Seq>
struct pop_front_impl;

template <template <typename...> class Seq, typename T, typename... Ts>
struct pop_front_impl<Seq<T, Ts...>> {
using type = Seq<Ts...>;
};
} // namespace detail

template <typename... Ts>
struct typelist {};

template <typename Seq>
using front = typename detail::front_impl<Seq>::type;

template <typename Seq>
using pop_front = typename detail::pop_front_impl<Seq>::type;
} // namespace mp

template <std::size_t N, class Seq>
struct variant_impl {
template <class Archive, class V>
static void load(Archive& ar, std::size_t which, V& v, const unsigned int version) {
if (which == 0) {
// note: A non-intrusive implementation (such as this one)
// necessary has to copy the value. This wouldn't be necessary
// with an implementation that de-serialized to the address of the
Expand All @@ -125,80 +109,62 @@ struct variant_impl
type value;
ar >> BOOST_SERIALIZATION_NVP(value);
v = std::move(value);
type * new_address = & std::get<type>(v);
ar.reset_object_address(new_address, & value);
type* new_address = &std::get<type>(v);
ar.reset_object_address(new_address, &value);
return;
}
//typedef typename mpl::pop_front<S>::type type;
// typedef typename mpl::pop_front<S>::type type;
using types = mp::pop_front<Seq>;
variant_impl<N - 1, types>::load(ar, which - 1, v, version);
}
};

template<class Seq>
struct variant_impl<0, Seq>
{
template<class Archive, class V>
static void load (
Archive & /*ar*/,
std::size_t /*which*/,
V & /*v*/,
const unsigned int /*version*/
){}
template <class Seq>
struct variant_impl<0, Seq> {
template <class Archive, class V>
static void load(Archive& /*ar*/, std::size_t /*which*/, V& /*v*/,
const unsigned int /*version*/
) {}
};

template<class Archive, class... Types>
void load(
Archive & ar,
std::variant<Types...>& v,
const unsigned int version
){
template <class Archive, class... Types>
void load(Archive& ar, std::variant<Types...>& v, const unsigned int version) {
std::size_t which;
ar >> BOOST_SERIALIZATION_NVP(which);
if(which >= sizeof...(Types))
if (which >= sizeof...(Types))
// this might happen if a type was removed from the list of variant types
boost::serialization::throw_exception(
boost::archive::archive_exception(
boost::archive::archive_exception::unsupported_version
)
);
boost::serialization::throw_exception(boost::archive::archive_exception(
boost::archive::archive_exception::unsupported_version));
variant_impl<sizeof...(Types), mp::typelist<Types...>>::load(ar, which, v, version);
}

template<class Archive,class... Types>
inline void serialize(
Archive & ar,
std::variant<Types...> & v,
const unsigned int file_version
){
split_free(ar,v,file_version);
template <class Archive, class... Types>
inline void serialize(Archive& ar, std::variant<Types...>& v, const unsigned int file_version) {
split_free(ar, v, file_version);
}

// Specialization for std::monostate
template<class Archive>
void serialize(Archive &ar, std::monostate &, const unsigned int /*version*/)
{}
template <class Archive>
void serialize(Archive& ar, std::monostate&, const unsigned int /*version*/) {}

} // namespace serialization
} // namespace boost

//template<typename T0_, BOOST_VARIANT_ENUM_SHIFTED_PARAMS(typename T)>
// template<typename T0_, BOOST_VARIANT_ENUM_SHIFTED_PARAMS(typename T)>

#include <boost/serialization/tracking.hpp>

namespace boost {
namespace serialization {
namespace serialization {

template<class... Types>
struct tracking_level<
std::variant<Types...>
>{
template <class... Types>
struct tracking_level<std::variant<Types...>> {
typedef mpl::integral_c_tag tag;
typedef mpl::int_< ::boost::serialization::track_always> type;
typedef mpl::int_<::boost::serialization::track_always> type;
BOOST_STATIC_CONSTANT(int, value = type::value);
};

} // namespace serialization
} // namespace boost

#endif //BOOST_SERIALIZATION_VARIANT_HPP
#endif // BOOST_SERIALIZATION_VARIANT_HPP
2 changes: 1 addition & 1 deletion src/core/arm/arm_interface.h
View file
Expand Up @@ -25,7 +25,7 @@ namespace Core {
class ARM_Interface : NonCopyable {
public:
explicit ARM_Interface(u32 id, std::shared_ptr<Core::Timing::Timer> timer)
: timer(timer), id(id){};
: timer(timer), id(id) {};
virtual ~ARM_Interface() {}

struct ThreadContext {
Expand Down
2 changes: 1 addition & 1 deletion src/core/core_timing.h
View file
Expand Up @@ -251,7 +251,7 @@ class Timing {

explicit Timing(std::size_t num_cores, u32 cpu_clock_percentage, s64 override_base_ticks = -1);

~Timing(){};
~Timing() {};

/**
* Returns the event_type identifier. if name is not unique, it will assert.
Expand Down
2 changes: 1 addition & 1 deletion src/core/hle/service/frd/frd.cpp
View file
Expand Up @@ -281,7 +281,7 @@ void Module::Interface::GetLastResponseResult(Kernel::HLERequestContext& ctx) {
rb.Push(ResultSuccess);
}

Module::Module(Core::System& system) : system(system){};
Module::Module(Core::System& system) : system(system) {};
Module::~Module() = default;

void InstallInterfaces(Core::System& system) {
Expand Down
8 changes: 4 additions & 4 deletions src/core/hle/service/http/http_c.h
View file
Expand Up @@ -183,7 +183,7 @@ class Context final {
};

struct RequestHeader {
RequestHeader(std::string name, std::string value) : name(name), value(value){};
RequestHeader(std::string name, std::string value) : name(name), value(value) {};
std::string name;
std::string value;

Expand Down Expand Up @@ -213,10 +213,10 @@ class Context final {

struct Param {
Param(const std::vector<u8>& value)
: name(value.begin(), value.end()), value(value.begin(), value.end()){};
Param(const std::string& name, const std::string& value) : name(name), value(value){};
: name(value.begin(), value.end()), value(value.begin(), value.end()) {};
Param(const std::string& name, const std::string& value) : name(name), value(value) {};
Param(const std::string& name, const std::vector<u8>& value)
: name(name), value(value.begin(), value.end()), is_binary(true){};
: name(name), value(value.begin(), value.end()), is_binary(true) {};
std::string name;
std::string value;
bool is_binary = false;
Expand Down

0 comments on commit 09196d7

Please sign in to comment.