[spellcheck] Updated Hunspell to 1.5.4

third_party/hunspell/src/hunspell/baseaffix.hxx

Index: third_party/hunspell/src/hunspell/baseaffix.hxx
diff --git a/third_party/hunspell/src/hunspell/baseaffix.hxx b/third_party/hunspell/src/hunspell/baseaffix.hxx
index ed64f3d84f750b9785a80d7fb982323c5e42e4fe..579c030bcfe56fd8a7ccd6e378bd3e9791b3dcd5 100644
--- a/third_party/hunspell/src/hunspell/baseaffix.hxx
+++ b/third_party/hunspell/src/hunspell/baseaffix.hxx
@@ -1,28 +1,77 @@
-#ifndef _BASEAFF_HXX_
-#define _BASEAFF_HXX_
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Hunspell, based on MySpell.
+ *
+ * The Initial Developers of the Original Code are
+ * Kevin Hendricks (MySpell) and Németh László (Hunspell).
+ * Portions created by the Initial Developers are Copyright (C) 2002-2005
+ * the Initial Developers. All Rights Reserved.
+ *
+ * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
+ * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
+ * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
+ * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
+ * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 
-#include "hunvisapi.h"
+#ifndef BASEAFF_HXX_
+#define BASEAFF_HXX_
 
-class LIBHUNSPELL_DLL_EXPORTED AffEntry
-{
-protected:
-    char *         appnd;
-    char *         strip;
-    unsigned char  appndl;
-    unsigned char  stripl;
-    char           numconds;
-    char           opts;
-    unsigned short aflag;
-    union {
-        char       conds[MAXCONDLEN];
-        struct {
-            char   conds1[MAXCONDLEN_1];
-            char * conds2;
-        } l;
-    } c;
-    char *           morphcode;
-    unsigned short * contclass;
-    short            contclasslen;
+#include <string>
+
+class AffEntry {
+ private:
+  AffEntry(const AffEntry&);
+  AffEntry& operator=(const AffEntry&);
+
+ public:
+  AffEntry()
+      : numconds(0),
+        opts(0),
+        aflag(0),
+        morphcode(0),
+        contclass(NULL),
+        contclasslen(0) {}
+  virtual ~AffEntry();
+  std::string appnd;
+  std::string strip;
+  unsigned char numconds;
+  char opts;
+  unsigned short aflag;
+  union {
+    char conds[MAXCONDLEN];
+    struct {
+      char conds1[MAXCONDLEN_1];
+      char* conds2;
+    } l;
+  } c;
+  char* morphcode;
+  unsigned short* contclass;
+  short contclasslen;
 };
 
 #endif