Last active
December 29, 2015 20:38
-
-
Save osimola/7724611 to your computer and use it in GitHub Desktop.
Patch to make libvoikko compile on OS X Mavericks
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/grammar/FinnishAnalysis.cpp b/src/grammar/FinnishAnalysis.cpp | |
index 5b89f16..e9f0c47 100644 | |
--- a/src/grammar/FinnishAnalysis.cpp | |
+++ b/src/grammar/FinnishAnalysis.cpp | |
@@ -35,7 +35,7 @@ | |
#include <cstring> | |
using namespace libvoikko::grammar; | |
-using namespace std; | |
+using std::list; | |
namespace libvoikko { | |
diff --git a/src/grammar/FinnishRuleEngine.cpp b/src/grammar/FinnishRuleEngine.cpp | |
index 36e1ec9..c8cab09 100644 | |
--- a/src/grammar/FinnishRuleEngine.cpp | |
+++ b/src/grammar/FinnishRuleEngine.cpp | |
@@ -37,8 +37,6 @@ | |
using namespace libvoikko::autocorrect; | |
-using namespace std; | |
- | |
namespace libvoikko { namespace grammar { | |
FinnishRuleEngine::FinnishRuleEngine(voikko_options_t * voikkoOptions) : | |
diff --git a/src/grammar/FinnishRuleEngine/CapitalizationCheck.cpp b/src/grammar/FinnishRuleEngine/CapitalizationCheck.cpp | |
index f30a49c..c2daa45 100644 | |
--- a/src/grammar/FinnishRuleEngine/CapitalizationCheck.cpp | |
+++ b/src/grammar/FinnishRuleEngine/CapitalizationCheck.cpp | |
@@ -36,7 +36,8 @@ | |
using namespace libvoikko::character; | |
using namespace libvoikko::utils; | |
-using namespace std; | |
+using std::list; | |
+using std::stack; | |
namespace libvoikko { namespace grammar { namespace check { | |
diff --git a/src/grammar/FinnishRuleEngine/MissingVerbCheck.cpp b/src/grammar/FinnishRuleEngine/MissingVerbCheck.cpp | |
index fea6c22..18b44d8 100644 | |
--- a/src/grammar/FinnishRuleEngine/MissingVerbCheck.cpp | |
+++ b/src/grammar/FinnishRuleEngine/MissingVerbCheck.cpp | |
@@ -30,8 +30,6 @@ | |
#include "character/SimpleChar.hpp" | |
#include "grammar/error.hpp" | |
-using namespace std; | |
- | |
namespace libvoikko { namespace grammar { namespace check { | |
void MissingVerbCheck::check(voikko_options_t * options, const Sentence * sentence) { | |
diff --git a/src/grammar/HfstAnalysis.cpp b/src/grammar/HfstAnalysis.cpp | |
index 9d9c694..d93031e 100644 | |
--- a/src/grammar/HfstAnalysis.cpp | |
+++ b/src/grammar/HfstAnalysis.cpp | |
@@ -44,7 +44,6 @@ | |
#include <vector> | |
using namespace libvoikko::grammar; | |
-using namespace std; | |
using namespace hfst_ol; | |
//using namespace hfst; | |
diff --git a/src/grammar/VoikkoGrammarError.hpp b/src/grammar/VoikkoGrammarError.hpp | |
index c0d5b5b..8e05e9a 100644 | |
--- a/src/grammar/VoikkoGrammarError.hpp | |
+++ b/src/grammar/VoikkoGrammarError.hpp | |
@@ -35,7 +35,7 @@ | |
namespace libvoikko { namespace grammar { | |
-struct GrammarChecker; | |
+class GrammarChecker; | |
class VoikkoGrammarError { | |
diff --git a/src/hyphenator/AnalyzerToFinnishHyphenatorAdapter.cpp b/src/hyphenator/AnalyzerToFinnishHyphenatorAdapter.cpp | |
index ea97c9a..cc5166f 100644 | |
--- a/src/hyphenator/AnalyzerToFinnishHyphenatorAdapter.cpp | |
+++ b/src/hyphenator/AnalyzerToFinnishHyphenatorAdapter.cpp | |
@@ -34,7 +34,7 @@ | |
using namespace libvoikko::morphology; | |
using namespace libvoikko::character; | |
-using namespace std; | |
+using std::list; | |
namespace libvoikko { namespace hyphenator { | |
diff --git a/src/spellchecker/FinnishSpellerTweaksWrapper.cpp b/src/spellchecker/FinnishSpellerTweaksWrapper.cpp | |
index 55121bf..1506848 100644 | |
--- a/src/spellchecker/FinnishSpellerTweaksWrapper.cpp | |
+++ b/src/spellchecker/FinnishSpellerTweaksWrapper.cpp | |
@@ -32,7 +32,7 @@ | |
#include "character/SimpleChar.hpp" | |
#include "utils/utils.hpp" | |
-using namespace std; | |
+using std::list; | |
using namespace libvoikko::morphology; | |
using namespace libvoikko::character; | |
diff --git a/src/spellchecker/suggestion/SuggestionGeneratorSoftHyphens.cpp b/src/spellchecker/suggestion/SuggestionGeneratorSoftHyphens.cpp | |
index 2be9732..fc11efb 100644 | |
--- a/src/spellchecker/suggestion/SuggestionGeneratorSoftHyphens.cpp | |
+++ b/src/spellchecker/suggestion/SuggestionGeneratorSoftHyphens.cpp | |
@@ -32,7 +32,7 @@ | |
#include <cwchar> | |
using namespace libvoikko::morphology; | |
-using namespace std; | |
+ | |
namespace libvoikko { namespace spellchecker { namespace suggestion { | |
diff --git a/src/utils/StringUtils.cpp b/src/utils/StringUtils.cpp | |
index 9d5560c..1c2c275 100644 | |
--- a/src/utils/StringUtils.cpp | |
+++ b/libvoikko/src/utils/StringUtils.cpp | |
@@ -32,8 +32,6 @@ | |
#include <cstdlib> | |
#include <cwchar> | |
-using namespace std; | |
- | |
namespace libvoikko { namespace utils { | |
wchar_t * StringUtils::ucs4FromUtf8(const char * const original) { | |
-- | |
1.8.4.3 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment