872cf486c5
This reverts the following commits:
commit 722f4e1d86
tdf#104573 - Assertion failed: SolarMutex not locked
commit f04ec99f5e
tdf#104573 - Assertion failed: SolarMutex not locked
commit 71b1e3ff63
tdf#104573 - Assertion failed: SolarMutex not locked when trying
commit e794ce1eef
verify that we hold the SolarMutex when ref-counting VclPtr
IRC discussion:
<noelgrandin> sberg, maybe I should revert this whole "VclPtr assert" series, I don't have mental bandwidth to sort this out properly now
<sberg> noelgrandin, what I fear is that you'll end up adding lots of SolarMutex locks to small places, where the proper fix would be to add it further out; and once such a dreaded recursive SolarMutex lock is in place (but needlessly so, once the proper fix is done), it's hard to clean that up again
<noelgrandin> sberg, yeah, in that case I'll just remove all of this, leave it for another day
Change-Id: Ie4f84b72b79a1b7e80164b5c7693af398c2c569a
Reviewed-on: https://gerrit.libreoffice.org/31946
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
68 lines
1.9 KiB
C++
68 lines
1.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
#ifndef INCLUDED_VCL_Reference_HXX
|
|
#define INCLUDED_VCL_Reference_HXX
|
|
|
|
#include <vcl/dllapi.h>
|
|
#include <tools/debug.hxx>
|
|
|
|
#include <cassert>
|
|
|
|
class VclReferenceBase;
|
|
|
|
class VCL_DLLPUBLIC VclReferenceBase
|
|
{
|
|
mutable int mnRefCnt;
|
|
|
|
template<typename T> friend class VclPtr;
|
|
|
|
public:
|
|
inline void acquire() const
|
|
{
|
|
assert(mnRefCnt>0);
|
|
mnRefCnt++;
|
|
}
|
|
|
|
inline void release() const
|
|
{
|
|
assert(mnRefCnt>0);
|
|
if (!--mnRefCnt)
|
|
delete this;
|
|
}
|
|
private:
|
|
VclReferenceBase(const VclReferenceBase&) = delete;
|
|
VclReferenceBase& operator=(const VclReferenceBase&) = delete;
|
|
|
|
bool mbDisposed : 1;
|
|
|
|
protected:
|
|
VclReferenceBase();
|
|
protected:
|
|
virtual ~VclReferenceBase();
|
|
|
|
protected:
|
|
virtual void dispose();
|
|
|
|
public:
|
|
void disposeOnce();
|
|
bool isDisposed() const { return mbDisposed; }
|
|
|
|
};
|
|
#endif
|