Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Cleanup

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman
2021-03-30 12:03:29 +02:00
parent 72f8b179d7
commit f3bb513545
14 changed files with 33 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libZRCola/include/zrcola/character.h
View File

@@ -22,6 +22,7 @@
#include "common.h"
#include <stdex/idrec.h>
#include <assert.h>
#include <algorithm>
#include <istream>
#include <map>
@@ -48,7 +49,7 @@ namespace ZRCola {
/// Character category ID type
/// Two letter abbreviation, non-terminated
///
struct ZRCOLA_API chrcatid_t {
struct chrcatid_t {
char data[2];
inline chrcatid_t& operator=(const chrcatid_t &src)
@@ -176,7 +177,7 @@ namespace ZRCola {
///
/// Character Database
///
class ZRCOLA_API character_db {
class character_db {
public:
#pragma pack(push)
#pragma pack(2)
@@ -334,13 +335,13 @@ namespace ZRCola {
};
typedef ZRCOLA_API stdex::idrec::record<character_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> character_rec;
typedef stdex::idrec::record<character_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> character_rec;
///
/// Character category database
///
class ZRCOLA_API chrcat_db {
class chrcat_db {
public:
#pragma pack(push)
#pragma pack(2)
@@ -502,7 +503,7 @@ namespace ZRCola {
};
typedef ZRCOLA_API stdex::idrec::record<chrcat_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrcat_rec;
typedef stdex::idrec::record<chrcat_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrcat_rec;
};

13
lib/libZRCola/include/zrcola/common.h
View File

@@ -29,11 +29,6 @@
#endif
///
/// Public function calling convention
///
#define ZRCOLA_API
#define ZRCOLA_NOVTABLE __declspec(novtable)
#pragma warning(push)
#pragma warning(disable: 4251)
#pragma warning(disable: 4512)
@@ -75,7 +70,7 @@ namespace ZRCola {
/// Language ID type
/// Three letter abbreviation, zero terminated
///
struct ZRCOLA_API langid_t {
struct langid_t {
char data[4];
inline langid_t& operator=(const langid_t &src)
@@ -221,7 +216,7 @@ namespace ZRCola {
/// \param[in] lang_win Windows language ID
/// \param[in,out] lang ZRCola language ID
///
void ZRCOLA_API LangConvert(_In_ LANGID lang_win, _Inout_ langid_t &lang);
void LangConvert(_In_ LANGID lang_win, _Inout_ langid_t &lang);
#endif
@@ -505,7 +500,7 @@ namespace ZRCola {
///
/// Source-destination index transformation mapping
///
class ZRCOLA_NOVTABLE ZRCOLA_API mapping {
class __declspec(novtable) mapping {
public:
size_t src; ///< Character index in source string
size_t dst; ///< Character index in destination string
@@ -523,7 +518,7 @@ namespace ZRCola {
///
/// A vector for destination-source index transformation mapping
///
class ZRCOLA_API mapping_vector : public std::vector<mapping> {
class mapping_vector : public std::vector<mapping> {
public:
///
/// Transforms character index of destination to source

8
lib/libZRCola/include/zrcola/language.h
View File

@@ -37,7 +37,7 @@ namespace ZRCola {
///
/// Language Character Database
///
class ZRCOLA_API langchar_db {
class langchar_db {
public:
#pragma pack(push)
#pragma pack(2)
@@ -195,13 +195,13 @@ namespace ZRCola {
};
typedef ZRCOLA_API stdex::idrec::record<langchar_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> langchar_rec;
typedef stdex::idrec::record<langchar_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> langchar_rec;
///
/// Language database
///
class ZRCOLA_API language_db {
class language_db {
public:
#pragma pack(push)
#pragma pack(2)
@@ -298,7 +298,7 @@ namespace ZRCola {
};
typedef ZRCOLA_API stdex::idrec::record<language_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> language_rec;
typedef stdex::idrec::record<language_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> language_rec;
};

9
lib/libZRCola/include/zrcola/tag.h
View File

@@ -22,6 +22,7 @@
#include "common.h"
#include <stdex/idrec.h>
#include <assert.h>
#include <istream>
#include <ostream>
#include <vector>
@@ -39,7 +40,7 @@ namespace ZRCola {
///
/// Character Tag Database
///
class ZRCOLA_API chrtag_db {
class chrtag_db {
public:
#pragma pack(push)
#pragma pack(2)
@@ -227,13 +228,13 @@ namespace ZRCola {
};
typedef ZRCOLA_API stdex::idrec::record<chrtag_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrtag_rec;
typedef stdex::idrec::record<chrtag_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrtag_rec;
///
/// Tag name database
///
class ZRCOLA_API tagname_db {
class tagname_db {
public:
#pragma pack(push)
#pragma pack(2)
@@ -440,7 +441,7 @@ namespace ZRCola {
};
typedef ZRCOLA_API stdex::idrec::record<tagname_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> tagname_rec;
typedef stdex::idrec::record<tagname_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> tagname_rec;
};

12
lib/libZRCola/include/zrcola/translate.h
View File

@@ -59,7 +59,7 @@ namespace ZRCola {
///
/// Translation database
///
class ZRCOLA_API translation_db {
class translation_db {
public:
#pragma pack(push)
#pragma pack(2)
@@ -324,13 +324,13 @@ namespace ZRCola {
};
typedef ZRCOLA_API stdex::idrec::record<translation_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> translation_rec;
typedef stdex::idrec::record<translation_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> translation_rec;
///
/// Translation set database
///
class ZRCOLA_API transet_db {
class transet_db {
public:
#pragma pack(push)
#pragma pack(2)
@@ -440,13 +440,13 @@ namespace ZRCola {
};
typedef ZRCOLA_API stdex::idrec::record<transet_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> transet_rec;
typedef stdex::idrec::record<transet_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> transet_rec;
///
/// Translation sequence database
///
class ZRCOLA_API transeq_db {
class transeq_db {
public:
#pragma pack(push)
#pragma pack(2)
@@ -621,7 +621,7 @@ namespace ZRCola {
};
typedef ZRCOLA_API stdex::idrec::record<transeq_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> transeq_rec;
typedef stdex::idrec::record<transeq_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> transeq_rec;
};