summaryrefslogtreecommitdiffstats
path: root/unicode/unicode.h
diff options
context:
space:
mode:
Diffstat (limited to 'unicode/unicode.h')
-rw-r--r--unicode/unicode.h62
1 files changed, 50 insertions, 12 deletions
diff --git a/unicode/unicode.h b/unicode/unicode.h
index 3efd9c7..bfe1256 100644
--- a/unicode/unicode.h
+++ b/unicode/unicode.h
@@ -887,6 +887,11 @@ extern size_t unicode_wcwidth(const std::vector<unicode_char> &uc);
namespace unicode {
/*
+ ** Various character sets
+ */
+ extern const char ucs_4[], ucs_2[], utf_8[], iso_8859_1[];
+
+ /*
** Interface to iconv.
**
** Subclass converted(). Invoke begin(), then operator(), repeatedly,
@@ -1270,13 +1275,20 @@ namespace unicode {
int opts;
+#if __cplusplus >= 201103L
+ public:
+ linebreak_callback_base(const linebreak_callback_base &)=delete;
+ linebreak_callback_base &operator=(const
+ linebreak_callback_base &)=delete;
+ private:
+#else
linebreak_callback_base(const linebreak_callback_base &);
/* NOT IMPLEMENTED */
- linebreak_callback_base &operator==(const
- linebreak_callback_base &);
+ linebreak_callback_base &operator=(const
+ linebreak_callback_base &);
/* NOT IMPLEMENTED */
-
+#endif
public:
linebreak_callback_base();
virtual ~linebreak_callback_base();
@@ -1304,7 +1316,7 @@ namespace unicode {
return operator()(vec.begin(), vec.end());
}
private:
- virtual int callback(int)=0;
+ virtual int callback(int);
};
class linebreak_callback_save_buf : public linebreak_callback_base {
@@ -1447,14 +1459,24 @@ namespace unicode {
int opts;
+#if __cplusplus >= 201103L
+ public:
+ linebreakc_callback_base(const linebreakc_callback_base &)
+ =delete;
+
+ linebreakc_callback_base &operator=(const
+ linebreakc_callback_base
+ &)=delete;
+ private:
+#else
linebreakc_callback_base(const linebreakc_callback_base &);
/* NOT IMPLEMENTED */
- linebreakc_callback_base &operator==(const
+ linebreakc_callback_base &operator=(const
linebreakc_callback_base
&);
/* NOT IMPLEMENTED */
-
+#endif
public:
linebreakc_callback_base();
@@ -1484,7 +1506,7 @@ namespace unicode {
return operator()(vec.begin(), vec.end());
}
private:
- virtual int callback(int, unicode_char)=0;
+ virtual int callback(int, unicode_char);
};
class linebreakc_callback_save_buf : public linebreakc_callback_base {
@@ -1632,13 +1654,22 @@ namespace unicode {
unicode_wb_info_t handle;
+#if __cplusplus >= 201103L
+ public:
+ wordbreak_callback_base(const wordbreak_callback_base &)=delete;
+
+ wordbreak_callback_base &operator=(const
+ wordbreak_callback_base &)
+ =delete;
+ private:
+#else
wordbreak_callback_base(const wordbreak_callback_base &);
/* NOT IMPLEMENTED */
- wordbreak_callback_base &operator==(const
- wordbreak_callback_base &);
+ wordbreak_callback_base &operator=(const
+ wordbreak_callback_base &);
/* NOT IMPLEMENTED */
-
+#endif
public:
wordbreak_callback_base();
virtual ~wordbreak_callback_base();
@@ -1665,7 +1696,7 @@ namespace unicode {
return operator()(vec.begin(), vec.end());
}
private:
- virtual int callback(bool)=0;
+ virtual int callback(bool);
};
/*
@@ -1676,11 +1707,18 @@ namespace unicode {
unicode_wbscan_info_t handle;
+#if __cplusplus >= 201103L
+ public:
+ wordbreakscan(const wordbreakscan &)=delete;
+ wordbreakscan &operator=(const wordbreakscan &)=delete;
+ private:
+#else
wordbreakscan(const wordbreakscan &);
/* NOT IMPLEMENTED */
- wordbreakscan &operator==(const wordbreakscan &);
+ wordbreakscan &operator=(const wordbreakscan &);
/* NOT IMPLEMENTED */
+#endif
public:
wordbreakscan();