coffee/uchardet
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/uchardet/uchardet.git synced 2025-12-23 20:24:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from wang-bin/c++abi

Browse Source 
do not use std::string which breaks c++ abi
This commit is contained in:
Carbo Kuo 2015-11-09 20:04:21 +01:00
commit 016eb18437
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/uchardet.cpp
View File

@ -35,41 +35,47 @@
*
* ***** END LICENSE BLOCK ***** */
#include "uchardet.h"
#include <string.h>
#include <stdlib.h>
#include "nscore.h"
#include "nsUniversalDetector.h"
#include <string>
using std::string;
class HandleUniversalDetector : public nsUniversalDetector
{
protected:
string m_charset;
char *m_charset;
public:
HandleUniversalDetector()
: nsUniversalDetector(NS_FILTER_ALL)
, m_charset(0)
{
m_charset = "";
}
virtual ~HandleUniversalDetector()
{}
{
if (m_charset)
free(m_charset);
}
virtual void Report(const char* charset)
{
m_charset = charset;
if (m_charset)
free(m_charset);
m_charset = strdup(charset);
}
virtual void Reset()
{
nsUniversalDetector::Reset();
m_charset = "";
if (m_charset)
free(m_charset);
m_charset = strdup("");
}
const char* GetCharset() const
{
return m_charset.c_str();
return m_charset;
}
};