Fix compilation on platforms where sizeof(wchar_t) == 2.

Use "set" instead of "unordered_set" as some facets are missing when
using gcc on cygwin, mingw and, possibly, FreeBSD.

diff --git a/src/OutputParams.cpp b/src/OutputParams.cpp
index 9b842980f7c8662e606fce4541483dd9a6b08958..465282c4944f985f75633ea2ab1b3c8a86b4d35b 100644 (file)
--- a/src/OutputParams.cpp
+++ b/src/OutputParams.cpp
@@ -34,7 +34,7 @@ OutputParams::OutputParams(Encoding const * enc)
          dryrun(false), silent(false), pass_thru(false),
          html_disable_captions(false), html_in_par(false),
          html_make_pars(true), docbook_in_par(false), docbook_make_pars(true),
          dryrun(false), silent(false), pass_thru(false),
          html_disable_captions(false), html_in_par(false),
          html_make_pars(true), docbook_in_par(false), docbook_make_pars(true),

-         docbook_force_pars(false), docbook_anchors_to_ignore(std::unordered_set<docstring>()), docbook_in_float(false),
+         docbook_force_pars(false), docbook_anchors_to_ignore(std::set<docstring>()), docbook_in_float(false),

          docbook_in_listing(false), for_toc(false), for_tooltip(false),
          for_search(false), for_preview(false), includeall(false)
 {
          docbook_in_listing(false), for_toc(false), for_tooltip(false),
          for_search(false), for_preview(false), includeall(false)
 {

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 9b4fdbf0006bcdd2bfc9fe9e0276995cd83edace..c2e85dc39fbdbd87614e880529e3d1f302e1b601 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -16,7 +16,7 @@
 #include "Changes.h"
 
 #include <memory>
 #include "Changes.h"
 
 #include <memory>

-#include <unordered_set>
+#include <set>

 
 
 namespace lyx {
 
 
 namespace lyx {


@@ -361,7 +361,7 @@ public:
        bool docbook_force_pars;
 
        /// Anchors that should not be output (LyX-side identifier, not DocBook-side).
        bool docbook_force_pars;
 
        /// Anchors that should not be output (LyX-side identifier, not DocBook-side).

-       std::unordered_set<docstring> docbook_anchors_to_ignore;
+       std::set<docstring> docbook_anchors_to_ignore;

 
        /// Is the current context a float (such as a table or a figure)?
        bool docbook_in_float;
 
        /// Is the current context a float (such as a table or a figure)?
        bool docbook_in_float;