Same make_obj call allocates the correct type
This commit is contained in:
parent
5d24b34200
commit
d9a90dda16
10 changed files with 53 additions and 17 deletions
|
|
@ -1,5 +1,6 @@
|
|||
#include "MainProgram.hpp"
|
||||
#include "DrawingProgram/DrawingProgramToolBase.hpp"
|
||||
#include "Helpers/NetworkingObjects/NetObjManagerTypeList.hpp"
|
||||
#include "VersionConstants.hpp"
|
||||
#include "cereal/archives/portable_binary.hpp"
|
||||
#include "cereal/details/helpers.hpp"
|
||||
|
|
@ -37,19 +38,16 @@
|
|||
#endif
|
||||
|
||||
#include <Helpers/Logger.hpp>
|
||||
#include <Helpers/Networking/NetLibrary.hpp>
|
||||
#include <Helpers/NetworkingObjects/NetObjOrderedList.hpp>
|
||||
#include <Helpers/NetworkingObjects/NetObjManager.hpp>
|
||||
#include <Helpers/NetworkingObjects/NetObjGenericSerializedClass.hpp>
|
||||
|
||||
MainProgram::MainProgram():
|
||||
fonts(std::make_shared<FontData>()),
|
||||
toolbar(*this)
|
||||
{
|
||||
auto typeList = std::make_shared<NetworkingObjects::NetObjManagerTypeList>();
|
||||
NetworkingObjects::register_generic_serialized_class<std::string>(*typeList);
|
||||
NetworkingObjects::register_ordered_list_class<std::string>(*typeList);
|
||||
auto nObjMan = std::make_shared<NetworkingObjects::NetObjManager>(typeList, false);
|
||||
netObjectTypeList = std::make_shared<NetworkingObjects::NetObjManagerTypeList>();
|
||||
NetworkingObjects::register_generic_serialized_class<std::string>(*netObjectTypeList);
|
||||
NetworkingObjects::register_ordered_list_class<std::string>(*netObjectTypeList);
|
||||
|
||||
displayName = Random::get().alphanumeric_str(10);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue