From d856f5174f6ba431f468235d28a15cc192a0b0c5 Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(B-4.4.46a)>
Date: Wed, 4 May 2011 23:36:22 +0200
Subject: [PATCH] Fix ParsingScope so its default copy constructor works in
gcc. Variables is noncopyable but default copy constructor was apparently
working in VS.
---
libwccl/parser/parsingscope.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libwccl/parser/parsingscope.h b/libwccl/parser/parsingscope.h
index acbf6ae..9157626 100644
--- a/libwccl/parser/parsingscope.h
+++ b/libwccl/parser/parsingscope.h
@@ -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_;
};
--
GitLab