Skip to content
Snippets Groups Projects
Commit d856f517 authored by Adam Wardynski's avatar Adam Wardynski
Browse files

Fix ParsingScope so its default copy constructor works in gcc.

Variables is noncopyable but default copy constructor was apparently working in VS.
parent 14b50fb1
No related merge requests found
......@@ -12,14 +12,14 @@ class ParsingScope
public:
ParsingScope(const Corpus2::Tagset& tagset, const Lexicons& lexicons)
: tagset_(tagset),
variables_(),
variables_(new Variables()),
lexicons_(lexicons)
{
}
explicit ParsingScope(const WcclFile& file)
: tagset_(file.tagset()),
variables_(),
variables_(new Variables()),
lexicons_(file.get_lexicons())
{
}
......@@ -33,11 +33,11 @@ public:
}
Variables& variables() {
return variables_;
return *variables_;
}
const Variables& variables() const {
return variables_;
return *variables_;
}
const Lexicons& lexicons() const {
......@@ -46,7 +46,7 @@ public:
private:
const Corpus2::Tagset& tagset_;
Variables variables_;
boost::shared_ptr<Variables> variables_;
const Lexicons& lexicons_;
};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment