Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

use G_BEGIN/END_DECLS

  • Loading branch information...
commit 2cc2dadc6bf0149f1a0ed386880e3fb4262e3b67 1 parent 60d7294
@epico authored
View
6 src/include/novel_types.h
@@ -29,7 +29,7 @@
#include <glib.h>
-namespace pinyin{
+G_BEGIN_DECLS
typedef guint32 phrase_token_t;
typedef gunichar ucs4_t;
@@ -61,10 +61,10 @@ typedef GArray * PhraseIndexRanges[PHRASE_INDEX_LIBRARY_COUNT];
/* Array of Token */
typedef GArray * PhraseTokens[PHRASE_INDEX_LIBRARY_COUNT];
+
/*
* PinYin Table Definition
*/
-class MemoryChunk;
/* For both PinYin Table and Phrase Table */
@@ -163,6 +163,6 @@ typedef enum {
#define LAMBDA_PARAMETER 0.347121
-};
+G_END_DECLS
#endif
View
20 src/pinyin.h
@@ -27,24 +27,10 @@
#include "novel_types.h"
#include "pinyin_custom2.h"
-namespace pinyin{
+G_BEGIN_DECLS
+
typedef struct _ChewingKey ChewingKey;
typedef struct _ChewingKeyRest ChewingKeyRest;
-};
-
-using pinyin::pinyin_option_t;
-using pinyin::DoublePinyinScheme;
-using pinyin::ChewingScheme;
-
-using pinyin::phrase_token_t;
-using pinyin::null_token;
-
-using pinyin::ChewingKey;
-using pinyin::ChewingKeyRest;
-using pinyin::ChewingKeyVector;
-
-
-extern "C" {
typedef struct _pinyin_context_t pinyin_context_t;
typedef struct _pinyin_instance_t pinyin_instance_t;
@@ -614,6 +600,6 @@ typedef ChewingKeyRest PinyinKeyPos;
#define LIBPINYIN_FORMAT_VERSION "0.8.92"
-};
+G_END_DECLS
#endif
View
8 src/storage/chewing_key.h
@@ -25,12 +25,14 @@
#include <glib.h>
#include "chewing_enum.h"
+using namespace pinyin;
+
+G_BEGIN_DECLS
+
/** @file chewing_key.h
* @brief the definitions of chewing key related classes and structs.
*/
-namespace pinyin{
-
/** Note: The parsed pinyins are stored in the following two
* GArrays to speed up chewing table lookup.
@@ -104,6 +106,6 @@ struct _ChewingKeyRest
typedef struct _ChewingKeyRest ChewingKeyRest;
-};
+G_END_DECLS
#endif
View
6 src/storage/pinyin_custom2.h
@@ -22,7 +22,9 @@
#ifndef PINYIN_CUSTOM2_H
#define PINYIN_CUSTOM2_H
-namespace pinyin{
+#include <glib.h>
+
+G_BEGIN_DECLS
/**
* PinyinTableFlag:
@@ -104,6 +106,6 @@ enum ChewingScheme
CHEWING_DEFAULT = CHEWING_STANDARD
};
-};
+G_END_DECLS
#endif
View
2  tests/test_pinyin.cpp
@@ -24,8 +24,6 @@
#include <stdlib.h>
#include <string.h>
-using namespace pinyin;
-
int main(int argc, char * argv[]){
pinyin_context_t * context =
pinyin_init("../data", "../data");
Please sign in to comment.
Something went wrong with that request. Please try again.