Yet even more rebasing
parent
62d25abb1a
commit
9f9807ef19
|
@ -78,10 +78,6 @@ struct Class {
|
||||||
void deserialization_fragments(FileWriter& proxyFile, FileWriter& wrapperFile,
|
void deserialization_fragments(FileWriter& proxyFile, FileWriter& wrapperFile,
|
||||||
const std::string& wrapperName, std::vector<std::string>& functionNames) const;
|
const std::string& wrapperName, std::vector<std::string>& functionNames) const;
|
||||||
|
|
||||||
// Creates a static member function that performs deserialization
|
|
||||||
void deserialization_fragments(FileWriter& proxyFile, FileWriter& wrapperFile,
|
|
||||||
const std::string& wrapperName, std::vector<std::string>& functionNames) const;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void pointer_constructor_fragments(FileWriter& proxyFile, FileWriter& wrapperFile, const std::string& wrapperName, std::vector<std::string>& functionNames) const;
|
void pointer_constructor_fragments(FileWriter& proxyFile, FileWriter& wrapperFile, const std::string& wrapperName, std::vector<std::string>& functionNames) const;
|
||||||
void comment_fragment(FileWriter& proxyFile) const;
|
void comment_fragment(FileWriter& proxyFile) const;
|
||||||
|
|
|
@ -507,10 +507,6 @@ void Module::matlab_code(const string& toolboxPath, const string& headerPath) co
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate includes while avoiding redundant includes
|
// Generate includes while avoiding redundant includes
|
||||||
if (hasSerialiable) {
|
|
||||||
wrapperFile.oss << "#include <boost/archive/text_iarchive.hpp>\n";
|
|
||||||
wrapperFile.oss << "#include <boost/archive/text_oarchive.hpp>\n\n";
|
|
||||||
}
|
|
||||||
generateIncludes(wrapperFile);
|
generateIncludes(wrapperFile);
|
||||||
|
|
||||||
// create typedef classes - we put this at the top of the wrap file so that collectors and method arguments can use these typedefs
|
// create typedef classes - we put this at the top of the wrap file so that collectors and method arguments can use these typedefs
|
||||||
|
|
|
@ -6,9 +6,6 @@
|
||||||
#include <boost/archive/text_iarchive.hpp>
|
#include <boost/archive/text_iarchive.hpp>
|
||||||
#include <boost/archive/text_oarchive.hpp>
|
#include <boost/archive/text_oarchive.hpp>
|
||||||
|
|
||||||
#include <boost/archive/text_iarchive.hpp>
|
|
||||||
#include <boost/archive/text_oarchive.hpp>
|
|
||||||
|
|
||||||
#include <folder/path/to/Test.h>
|
#include <folder/path/to/Test.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue