From f293705256c6cfe67439e62fd9edad7ef465aa3d Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(B-4.4.46a)>
Date: Fri, 29 Apr 2011 21:55:29 +0200
Subject: [PATCH] Fix some gcc compile errors/warnings
---
libwccl/lexicon/lexfilegrammar.g | 5 ++---
libwccl/lexicon/lexicon.cpp | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libwccl/lexicon/lexfilegrammar.g b/libwccl/lexicon/lexfilegrammar.g
index a0cb159..19640c6 100644
--- a/libwccl/lexicon/lexfilegrammar.g
+++ b/libwccl/lexicon/lexfilegrammar.g
@@ -5,7 +5,6 @@ header {
#include <antlr/Token.hpp>
#include <boost/shared_ptr.hpp>
- #include <boost/make_shared.hpp>
#include <libwccl/lexicon/lexicon.h>
@@ -57,7 +56,7 @@ parse_lexicon_file
[const std::string& name]
returns [boost::shared_ptr<Lexicon> lex]
{
- lex = boost::make_shared<Lexicon>(name);
+ lex.reset(new Lexicon(name));
}
: (lexicon_entry [*lex])*
EOF
@@ -113,4 +112,4 @@ NEWLINE
| '\r'
| '\n'
) { newline(); $setType(antlr::Token::SKIP); }
-;
\ No newline at end of file
+;
diff --git a/libwccl/lexicon/lexicon.cpp b/libwccl/lexicon/lexicon.cpp
index e985d19..3dd0f38 100644
--- a/libwccl/lexicon/lexicon.cpp
+++ b/libwccl/lexicon/lexicon.cpp
@@ -4,10 +4,11 @@
#include <libpwrutils/foreach.h>
#include <boost/make_shared.hpp>
+#include <unicode/unistr.h>
namespace Wccl {
-const UnicodeString& Lexicon::translate(const icu_44::UnicodeString &key) const
+const UnicodeString& Lexicon::translate(const UnicodeString &key) const
{
static UnicodeString empty;
map_t::const_iterator i = map_.find(key);
--
GitLab