mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need for rtl::Reference friend, no need for #include vclptr.hxx

Browse Source 
Change-Id: I7bdd15a93e728ef7e98a53001c6eb6b56f761a6d
This commit is contained in:
Stephan Bergmann
2016-12-09 20:01:52 +01:00
parent cbf5b21f2a
commit a9659f30d6
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/test/vclwidgets.cxx
View File

@@ -8,6 +8,8 @@
*/ */
#include <sal/config.h> #include <sal/config.h>
#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx> #include <vcl/vclreferencebase.hxx>
struct Widget : public VclReferenceBase struct Widget : public VclReferenceBase

1
include/vcl/abstdlg.hxx
View File

@@ -22,6 +22,7 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/link.hxx> #include <tools/link.hxx>
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx> #include <vcl/vclreferencebase.hxx>
#include <vector> #include <vector>

5
include/vcl/vclreferencebase.hxx
View File

@@ -20,8 +20,8 @@
#define INCLUDED_VCL_Reference_HXX #define INCLUDED_VCL_Reference_HXX
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <vcl/vclptr.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <cassert> #include <cassert>
class VclReferenceBase; class VclReferenceBase;
@@ -30,8 +30,7 @@ class VCL_DLLPUBLIC VclReferenceBase
{ {
mutable int mnRefCnt; mutable int mnRefCnt;
template<typename T> friend class ::rtl::Reference; template<typename T> friend class VclPtr;
template<typename T> friend class ::VclPtr;
public: public:
inline void acquire() const inline void acquire() const