From 4cfb31bf6abb2d42181e78e8d0758cf74a8a774a Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:30:04 +0200 Subject: 6.0 --- zenxml/LICENSE_1_0.txt | 23 ----------------------- zenxml/zenxml/bind.h | 4 ++-- zenxml/zenxml/cvrt_struc.h | 4 ++-- zenxml/zenxml/cvrt_text.h | 4 ++-- zenxml/zenxml/dom.h | 8 ++++---- zenxml/zenxml/error.h | 4 ++-- zenxml/zenxml/io.h | 4 ++-- zenxml/zenxml/parser.h | 4 ++-- zenxml/zenxml/unit_test.cpp | 4 ++-- zenxml/zenxml/xml.h | 4 ++-- 10 files changed, 20 insertions(+), 43 deletions(-) delete mode 100644 zenxml/LICENSE_1_0.txt (limited to 'zenxml') diff --git a/zenxml/LICENSE_1_0.txt b/zenxml/LICENSE_1_0.txt deleted file mode 100644 index 36b7cd93..00000000 --- a/zenxml/LICENSE_1_0.txt +++ /dev/null @@ -1,23 +0,0 @@ -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/zenxml/zenxml/bind.h b/zenxml/zenxml/bind.h index abeff452..e66d841b 100644 --- a/zenxml/zenxml/bind.h +++ b/zenxml/zenxml/bind.h @@ -1,6 +1,6 @@ // ************************************************************************** -// * This file is part of the zen::Xml project. It is distributed under the * -// * Boost Software License: http://www.boost.org/LICENSE_1_0.txt * +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zenxml/zenxml/cvrt_struc.h b/zenxml/zenxml/cvrt_struc.h index 690edacb..ceb4297d 100644 --- a/zenxml/zenxml/cvrt_struc.h +++ b/zenxml/zenxml/cvrt_struc.h @@ -1,6 +1,6 @@ // ************************************************************************** -// * This file is part of the zen::Xml project. It is distributed under the * -// * Boost Software License: http://www.boost.org/LICENSE_1_0.txt * +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zenxml/zenxml/cvrt_text.h b/zenxml/zenxml/cvrt_text.h index 80664317..43272d48 100644 --- a/zenxml/zenxml/cvrt_text.h +++ b/zenxml/zenxml/cvrt_text.h @@ -1,6 +1,6 @@ // ************************************************************************** -// * This file is part of the zen::Xml project. It is distributed under the * -// * Boost Software License: http://www.boost.org/LICENSE_1_0.txt * +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zenxml/zenxml/dom.h b/zenxml/zenxml/dom.h index a2ed78f7..cb5e5aab 100644 --- a/zenxml/zenxml/dom.h +++ b/zenxml/zenxml/dom.h @@ -1,6 +1,6 @@ // ************************************************************************** -// * This file is part of the zen::Xml project. It is distributed under the * -// * Boost Software License: http://www.boost.org/LICENSE_1_0.txt * +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -124,8 +124,8 @@ public: } template < class IterTy, //underlying iterator type - class T, //target object type - class AccessPolicy > //access policy: see AccessPtrMap + class T, //target object type + class AccessPolicy > //access policy: see AccessPtrMap class PtrIter : public std::iterator, private AccessPolicy //get rid of shared_ptr indirection { public: diff --git a/zenxml/zenxml/error.h b/zenxml/zenxml/error.h index bea04520..645f24f7 100644 --- a/zenxml/zenxml/error.h +++ b/zenxml/zenxml/error.h @@ -1,6 +1,6 @@ // ************************************************************************** -// * This file is part of the zen::Xml project. It is distributed under the * -// * Boost Software License: http://www.boost.org/LICENSE_1_0.txt * +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zenxml/zenxml/io.h b/zenxml/zenxml/io.h index 596d7acf..09bb7358 100644 --- a/zenxml/zenxml/io.h +++ b/zenxml/zenxml/io.h @@ -1,6 +1,6 @@ // ************************************************************************** -// * This file is part of the zen::Xml project. It is distributed under the * -// * Boost Software License: http://www.boost.org/LICENSE_1_0.txt * +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zenxml/zenxml/parser.h b/zenxml/zenxml/parser.h index 51779852..19d36ed5 100644 --- a/zenxml/zenxml/parser.h +++ b/zenxml/zenxml/parser.h @@ -1,6 +1,6 @@ // ************************************************************************** -// * This file is part of the zen::Xml project. It is distributed under the * -// * Boost Software License: http://www.boost.org/LICENSE_1_0.txt * +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zenxml/zenxml/unit_test.cpp b/zenxml/zenxml/unit_test.cpp index 8f49de6f..084e764b 100644 --- a/zenxml/zenxml/unit_test.cpp +++ b/zenxml/zenxml/unit_test.cpp @@ -1,6 +1,6 @@ // ************************************************************************** -// * This file is part of the zen::Xml project. It is distributed under the * -// * Boost Software License: http://www.boost.org/LICENSE_1_0.txt * +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zenxml/zenxml/xml.h b/zenxml/zenxml/xml.h index 3a01b1a1..411593e7 100644 --- a/zenxml/zenxml/xml.h +++ b/zenxml/zenxml/xml.h @@ -1,6 +1,6 @@ // ************************************************************************** -// * This file is part of the zen::Xml project. It is distributed under the * -// * Boost Software License: http://www.boost.org/LICENSE_1_0.txt * +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** -- cgit