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

Fix some gcc compile errors/warnings

parent fa2ea2b1
Branches
No related merge requests found
...@@ -5,7 +5,6 @@ header { ...@@ -5,7 +5,6 @@ header {
#include <antlr/Token.hpp> #include <antlr/Token.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/make_shared.hpp>
#include <libwccl/lexicon/lexicon.h> #include <libwccl/lexicon/lexicon.h>
...@@ -57,7 +56,7 @@ parse_lexicon_file ...@@ -57,7 +56,7 @@ parse_lexicon_file
[const std::string& name] [const std::string& name]
returns [boost::shared_ptr<Lexicon> lex] returns [boost::shared_ptr<Lexicon> lex]
{ {
lex = boost::make_shared<Lexicon>(name); lex.reset(new Lexicon(name));
} }
: (lexicon_entry [*lex])* : (lexicon_entry [*lex])*
EOF EOF
...@@ -113,4 +112,4 @@ NEWLINE ...@@ -113,4 +112,4 @@ NEWLINE
| '\r' | '\r'
| '\n' | '\n'
) { newline(); $setType(antlr::Token::SKIP); } ) { newline(); $setType(antlr::Token::SKIP); }
; ;
\ No newline at end of file
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
#include <libpwrutils/foreach.h> #include <libpwrutils/foreach.h>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <unicode/unistr.h>
namespace Wccl { namespace Wccl {
const UnicodeString& Lexicon::translate(const icu_44::UnicodeString &key) const const UnicodeString& Lexicon::translate(const UnicodeString &key) const
{ {
static UnicodeString empty; static UnicodeString empty;
map_t::const_iterator i = map_.find(key); map_t::const_iterator i = map_.find(key);
......
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