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

Stephan Bergmann sbergman at redhat.com
Tue Apr 30 14:39:13 PDT 2013


 include/vcl/builder.hxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f4227c822c7f5a4e1e1b3b4e096cb63cf710a3f1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 30 23:38:40 2013 +0200

    Blind fix for MSVC, take two
    
    ...it is likely rather the implicitly defined inline special member functions
    of VclBuilder that cause the trouble of trying to fully instantiate
    boost::ptr_map<OUString,osl::Module>.
    
    Change-Id: I67ad7434b4e3a2e01c15f7e39080226676412af1

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index fff53c3..83532dd 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -20,6 +20,7 @@
 #include <set>
 #include <stack>
 #include <vector>
+#include <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_map.hpp>
 
 class ListBox;
@@ -38,7 +39,7 @@ class SAL_DLLPUBLIC_TEMPLATE ModuleMap:
 
 } }
 
-class VCL_DLLPUBLIC VclBuilder
+class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable
 {
 public:
     typedef std::map<OString, OString> stringmap;


More information about the Libreoffice-commits mailing list