[Libreoffice-commits] core.git: include/vcl vcl/inc

[Noel Grandin]

 include/vcl/salnativewidgets.hxx |   17 -----------------
 vcl/inc/svdata.hxx               |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit bf86287c5f439c4873e8e7d191449ef40dee5795
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Jan 29 15:06:16 2016 +0200

    move boost header dependency for ControlCacheHashFunction inside vcl
    
    ControlCacheHashFunction is only used by vcl/opengl/*
    
    Change-Id: Id3aef4fc1ffc909a24a9cce0b86c5dc82e6e6612
    Reviewed-on: https://gerrit.libreoffice.org/21900
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 8c1176a..55de313 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -25,8 +25,6 @@
 #include <tools/gen.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-#include <boost/functional/hash.hpp>
-
 /* Control Types:
  *
  *   Specify the overall, whole control
@@ -302,21 +300,6 @@ public:
     }
 };
 
-struct ControlCacheHashFunction
-{
-    std::size_t operator()(ControlCacheKey const& aCache) const
-    {
-        std::size_t seed = 0;
-        boost::hash_combine(seed, aCache.mnType);
-        boost::hash_combine(seed, aCache.mnPart);
-        boost::hash_combine(seed, aCache.mnState);
-        boost::hash_combine(seed, aCache.maSize.Width());
-        boost::hash_combine(seed, aCache.maSize.Height());
-        return seed;
-    }
-};
-
-
 /* ButtonValue:
  *
  *   Identifies the tri-state value options
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 0856d32..a0663b1 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -34,6 +34,7 @@
 #include "xconnection.hxx"
 
 #include <unordered_map>
+#include <boost/functional/hash.hpp>
 
 struct ImplTimerData;
 struct ImplIdleData;
@@ -399,6 +400,20 @@ struct ImplSVEvent
     bool                mbCall;
 };
 
+struct ControlCacheHashFunction
+{
+    std::size_t operator()(ControlCacheKey const& aCache) const
+    {
+        std::size_t seed = 0;
+        boost::hash_combine(seed, aCache.mnType);
+        boost::hash_combine(seed, aCache.mnPart);
+        boost::hash_combine(seed, aCache.mnState);
+        boost::hash_combine(seed, aCache.maSize.Width());
+        boost::hash_combine(seed, aCache.maSize.Height());
+        return seed;
+    }
+};
+
 #endif // INCLUDED_VCL_INC_SVDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */