From 09711f3720c036c51a7b96f96182b09f1c082f93 Mon Sep 17 00:00:00 2001 From: bugmaster <bugmaster@opencascade.com> Date: Thu, 9 Oct 2014 16:38:43 +0400 Subject: [PATCH] Incrementation of OCCT version up to 6.8.0beta Correction of license statements --- src/GeomInt/GeomInt.cxx | 19 +++++++++++++++---- src/IVtkTools/IVtkTools_DisplayModeFilter.hxx | 4 ++-- src/MeshVS/MeshVS_SymmetricPairHasher.hxx | 13 +++++++++++++ .../NCollection_WinHeapAllocator.cxx | 18 ++++++++++++++---- .../NCollection_WinHeapAllocator.hxx | 18 ++++++++++++++---- src/Standard/Standard_Version.hxx | 2 +- 6 files changed, 59 insertions(+), 15 deletions(-) diff --git a/src/GeomInt/GeomInt.cxx b/src/GeomInt/GeomInt.cxx index 3b88d1ffe4..ad6bb2b777 100644 --- a/src/GeomInt/GeomInt.cxx +++ b/src/GeomInt/GeomInt.cxx @@ -1,7 +1,18 @@ -// File: GeomInt.cxx -// Created: 25.08.14 17:59:59 -// Author: jgv@VIVEX -// Copyright: Open CASCADE 2014 + +// Created on: 25.08.14 17:59:59 +// Created by: jgv@VIVEX +// Copyright (c) 1999-2014 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. #include <GeomInt.hxx> #include <TColStd_IndexedMapOfInteger.hxx> diff --git a/src/IVtkTools/IVtkTools_DisplayModeFilter.hxx b/src/IVtkTools/IVtkTools_DisplayModeFilter.hxx index 4a1e4684e5..4f17f8d728 100644 --- a/src/IVtkTools/IVtkTools_DisplayModeFilter.hxx +++ b/src/IVtkTools/IVtkTools_DisplayModeFilter.hxx @@ -4,8 +4,8 @@ // // This file is part of Open CASCADE Technology software library. // -// This library is free software; you can redistribute it and / or modify it -// under the terms of the GNU Lesser General Public version 2.1 as published +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published // by the Free Software Foundation, with special exception defined in the file // OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT // distribution for complete text of the license and disclaimer of any warranty. diff --git a/src/MeshVS/MeshVS_SymmetricPairHasher.hxx b/src/MeshVS/MeshVS_SymmetricPairHasher.hxx index 8fd64227b1..e3abfbcc28 100644 --- a/src/MeshVS/MeshVS_SymmetricPairHasher.hxx +++ b/src/MeshVS/MeshVS_SymmetricPairHasher.hxx @@ -1,3 +1,16 @@ +// Copyright (c) 1999-2014 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + #ifndef _MeshVS_SymmetricPairHasher_HeaderFile #define _MeshVS_SymmetricPairHasher_HeaderFile diff --git a/src/NCollection/NCollection_WinHeapAllocator.cxx b/src/NCollection/NCollection_WinHeapAllocator.cxx index dde35c304b..12c9b00427 100644 --- a/src/NCollection/NCollection_WinHeapAllocator.cxx +++ b/src/NCollection/NCollection_WinHeapAllocator.cxx @@ -1,7 +1,17 @@ -// File: NCollection_WinHeapAllocator.cxx -// Created: 22.07.11 -// Author: Kirill GAVRILOV -// Copyright: Open Cascade 2011 +// Created on: 22.07.11 +// Created by: Kirill GAVRILOV +// Copyright (c) 2002-2014 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. #include <NCollection_WinHeapAllocator.hxx> #include <Standard_OutOfMemory.hxx> diff --git a/src/NCollection/NCollection_WinHeapAllocator.hxx b/src/NCollection/NCollection_WinHeapAllocator.hxx index 698a7d9e77..54af690727 100644 --- a/src/NCollection/NCollection_WinHeapAllocator.hxx +++ b/src/NCollection/NCollection_WinHeapAllocator.hxx @@ -1,7 +1,17 @@ -// File: NCollection_WinHeapAllocator.hxx -// Created: 22.07.11 -// Author: Kirill GAVRILOV -// Copyright: Open Cascade 2011 +// Created on: 2011-07-11 +// Created by: Kirill GAVRILOV +// Copyright (c) 2002-2014 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. #ifndef NCollection_WinHeapAllocator_HeaderFile #define NCollection_WinHeapAllocator_HeaderFile diff --git a/src/Standard/Standard_Version.hxx b/src/Standard/Standard_Version.hxx index 4c10e3d918..573d20f240 100644 --- a/src/Standard/Standard_Version.hxx +++ b/src/Standard/Standard_Version.hxx @@ -42,7 +42,7 @@ //! - "dev" for official (certified) version (master branch) between releases //! - "beta..." or "rc..." for beta releases or release candidates //! - "project..." for version containing project-specific fixes -#define OCC_VERSION_DEVELOPMENT "dev" +#define OCC_VERSION_DEVELOPMENT "beta" // Derived (manually): version as real and string (major.minor) #define OCC_VERSION 6.8