compilerplugins/clang/test/vclwidgets.cxx | 2 ++
include/vcl/abstdlg.hxx | 1 +
include/vcl/vclreferencebase.hxx | 5 ++---
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit a9659f30d6e50c138704f2fbc7f35cc282e7ec77
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 9 20:01:52 2016 +0100
No need for rtl::Reference friend, no need for #include vclptr.hxx
Change-Id: I7bdd15a93e728ef7e98a53001c6eb6b56f761a6d
diff --git a/compilerplugins/clang/test/vclwidgets.cxx
b/compilerplugins/clang/test/vclwidgets.cxx
index c18c775..d7926c0 100644
--- a/compilerplugins/clang/test/vclwidgets.cxx
+++ b/compilerplugins/clang/test/vclwidgets.cxx
@@ -8,6 +8,8 @@
*/
#include <sal/config.h>
+
+#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx>
struct Widget : public VclReferenceBase
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index c173326..5303165 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -22,6 +22,7 @@
#include <rtl/ustring.hxx>
#include <tools/link.hxx>
#include <vcl/dllapi.h>
+#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx>
#include <vector>
diff --git a/include/vcl/vclreferencebase.hxx b/include/vcl/vclreferencebase.hxx
index dbd3bc9..ce3e973 100644
--- a/include/vcl/vclreferencebase.hxx
+++ b/include/vcl/vclreferencebase.hxx
@@ -20,8 +20,8 @@
#define INCLUDED_VCL_Reference_HXX
#include <vcl/dllapi.h>
-#include <vcl/vclptr.hxx>
#include <tools/debug.hxx>
+
#include <cassert>
class VclReferenceBase;
@@ -30,8 +30,7 @@ class VCL_DLLPUBLIC VclReferenceBase
{
mutable int mnRefCnt;
- template<typename T> friend class ::rtl::Reference;
- template<typename T> friend class ::VclPtr;
+ template<typename T> friend class VclPtr;
public:
inline void acquire() const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
