Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 5180655f authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

fixed last commit which was somehow broken...

parent 12c47d2e
...@@ -2,28 +2,23 @@ ...@@ -2,28 +2,23 @@
// //
// This file is part of the CAMPVis Software Framework. // This file is part of the CAMPVis Software Framework.
// //
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved, // If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
// Christian Schulte zu Berge <christian.szb@in.tum.de> // Christian Schulte zu Berge <christian.szb@in.tum.de>
// Chair for Computer Aided Medical Procedures // Chair for Computer Aided Medical Procedures
// Technische Universität München // Technische Universitaet Muenchen
// Boltzmannstr. 3, 85748 Garching b. München, Germany // Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
//
// For a full list of authors and contributors, please refer to the file "AUTHORS.txt". // For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
// //
// The licensing of this softare is not yet resolved. Until then, redistribution in source or // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
// binary forms outside the CAMP chair is not permitted, unless explicitly stated in legal form. // except in compliance with the License. You may obtain a copy of the License at
// However, the names of the original authors and the above copyright notice must retain in its //
// original state in any case. // http://www.apache.org/licenses/LICENSE-2.0
// //
// Legal disclaimer provided by the BSD license: // Unless required by applicable law or agreed to in writing, software distributed under the
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR // License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY // either express or implied. See the License for the specific language governing permissions
// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR // and limitations under the License.
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
// //
// ================================================================================================ // ================================================================================================
...@@ -34,7 +29,6 @@ ...@@ -34,7 +29,6 @@
#include "core/coreapi.h" #include "core/coreapi.h"
#include "core/datastructures/scopedtypeddata.h" // not directly needed here but by many classes including AbstractData #include "core/datastructures/scopedtypeddata.h" // not directly needed here but by many classes including AbstractData
#include "core/tools/referencecounted.h"
namespace campvis { namespace campvis {
...@@ -62,7 +56,7 @@ namespace campvis { ...@@ -62,7 +56,7 @@ namespace campvis {
* *
* \todo * \todo
*/ */
class CAMPVIS_CORE_API AbstractData : public ReferenceCounted { class CAMPVIS_CORE_API AbstractData {
public: public:
/** /**
* Constructor, simply calles ReferenceCounted ctor. * Constructor, simply calles ReferenceCounted ctor.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment