diff --git a/include/boost/utility/enable_if.hpp b/include/boost/utility/enable_if.hpp index 53a4f25..52d3d88 100644 --- a/include/boost/utility/enable_if.hpp +++ b/include/boost/utility/enable_if.hpp @@ -1,63 +1,33 @@ -// -// Software License -// -// Copyright 2003 © The Trustees of Indiana University. All rights -// reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// 1. All redistributions of source code must retain the above copyright -// notice, the list of authors in the original source code, this list -// of conditions and the disclaimer listed in this license; -// 2. All redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the disclaimer -// listed in this license in the documentation and/or other materials -// provided with the distribution; -// 3. Any documentation included with all redistributions must include -// the following acknowledgement: -// -// -// This product includes software developed by the Open Systems Laboratory -// at Indiana University. For further information contact Andrew Lumsdaine -// at lums@osl.iu.edu. -// -// Alternatively, this acknowledgement may appear in the software itself, -// and wherever such third-party acknowledgments normally appear. -// -// 4. The name Indiana University shall not be used to endorse or promote -// products derived from this software without prior written permission -// from Indiana University. For written permission, please contact the -// Advanced Research and Technology Institute (ARTI) at 1100 Waterway -// Blvd., Indianapolis, Indiana 46202. -// 5. Products derived from this software may not be called enable_if, nor -// may Indiana University appear in their name, without prior written -// permission of ARTI. -// -// -// -// Indiana University provides no reassurances that the source code -// provided does not infringe the patent or any other intellectual -// property rights of any other entity. Indiana University disclaims any -// liability to any recipient for claims brought by any other entity -// based on infringement of intellectual property rights or otherwise. -// -// LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH -// NO WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. INDIANA -// UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT -// SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR -// OTHER PROPRIETARY RIGHTS. INDIANA UNIVERSITY MAKES NO WARRANTIES THAT -// SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP -// DOORS", "WORMS", OR OTHER HARMFUL CODE. LICENSEE ASSUMES THE ENTIRE -// RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS, -// AND TO THE PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING -// SOFTWARE. -// -// -// Authors: Jaakko Järvi (jajarvi@osl.iu.edu) -// Jeremiah Willcock (jewillco@osl.iu.edu) -// Andrew Lumsdaine (lums@osl.iu.edu) -// +// Copyright 2003 © The Trustees of Indiana University. All rights reserved. + +// 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. + +// Authors: Jaakko Järvi (jajarvi at osl.iu.edu) +// Jeremiah Willcock (jewillco at osl.iu.edu) +// Andrew Lumsdaine (lums at osl.iu.edu) + #ifndef BOOST_UTILITY_ENABLE_IF_HPP #define BOOST_UTILITY_ENABLE_IF_HPP diff --git a/test/enable_if_LICENSE b/test/enable_if_LICENSE index 06f4565..36b7cd9 100644 --- a/test/enable_if_LICENSE +++ b/test/enable_if_LICENSE @@ -1,53 +1,23 @@ - Software License +Boost Software License - Version 1.0 - August 17th, 2003 - Copyright 2003 © The Trustees of Indiana University. All rights - reserved. +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: - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - 1. All redistributions of source code must retain the above copyright - notice, the list of authors in the original source code, this list - of conditions and the disclaimer listed in this license; - 2. All redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the disclaimer - listed in this license in the documentation and/or other materials - provided with the distribution; - 3. Any documentation included with all redistributions must include - the following acknowledgement: +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. - - This product includes software developed by the Open Systems Laboratory - at Indiana University. For further information contact Andrew Lumsdaine - at lums@osl.iu.edu. - - Alternatively, this acknowledgement may appear in the software itself, - and wherever such third-party acknowledgments normally appear. - - 4. The name Indiana University shall not be used to endorse or promote - products derived from this software without prior written permission - from Indiana University. For written permission, please contact the - Advanced Research and Technology Institute (ARTI) at 1100 Waterway - Blvd., Indianapolis, Indiana 46202. - 5. Products derived from this software may not be called enable_if, nor - may Indiana University appear in their name, without prior written - permission of ARTI. - - - - Indiana University provides no reassurances that the source code - provided does not infringe the patent or any other intellectual - property rights of any other entity. Indiana University disclaims any - liability to any recipient for claims brought by any other entity - based on infringement of intellectual property rights or otherwise. - - LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH - NO WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. INDIANA - UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT - SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR - OTHER PROPRIETARY RIGHTS. INDIANA UNIVERSITY MAKES NO WARRANTIES THAT - SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP - DOORS", "WORMS", OR OTHER HARMFUL CODE. LICENSEE ASSUMES THE ENTIRE - RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS, - AND TO THE PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING - SOFTWARE. +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/test/enable_if_constructors.cpp b/test/enable_if_constructors.cpp index 39b21d6..43a8e8e 100644 --- a/test/enable_if_constructors.cpp +++ b/test/enable_if_constructors.cpp @@ -4,9 +4,9 @@ // // See the file enable_if_LICENSE for licensing conditions. // -// Authors: Jaakko Järvi (jajarvi@osl.iu.edu) -// Jeremiah Willcock (jewillco@osl.iu.edu) -// Andrew Lumsdaine (lums@osl.iu.edu) +// Authors: Jaakko Järvi (jajarvi at osl.iu.edu) +// Jeremiah Willcock (jewillco at osl.iu.edu) +// Andrew Lumsdaine (lums at osl.iu.edu) // #include diff --git a/test/enable_if_dummy_arg_disambiguation.cpp b/test/enable_if_dummy_arg_disambiguation.cpp index 3e14426..8c18358 100644 --- a/test/enable_if_dummy_arg_disambiguation.cpp +++ b/test/enable_if_dummy_arg_disambiguation.cpp @@ -4,9 +4,9 @@ // // See the file enable_if_LICENSE for licensing conditions. // -// Authors: Jaakko Järvi (jajarvi@osl.iu.edu) -// Jeremiah Willcock (jewillco@osl.iu.edu) -// Andrew Lumsdaine (lums@osl.iu.edu) +// Authors: Jaakko Järvi (jajarvi at osl.iu.edu) +// Jeremiah Willcock (jewillco at osl.iu.edu) +// Andrew Lumsdaine (lums at osl.iu.edu) // #include diff --git a/test/enable_if_lazy.cpp b/test/enable_if_lazy.cpp index f69502a..11e5ce3 100644 --- a/test/enable_if_lazy.cpp +++ b/test/enable_if_lazy.cpp @@ -4,9 +4,9 @@ // // See the file enable_if_LICENSE for licensing conditions. // -// Authors: Jaakko Järvi (jajarvi@osl.iu.edu) -// Jeremiah Willcock (jewillco@osl.iu.edu) -// Andrew Lumsdaine (lums@osl.iu.edu) +// Authors: Jaakko Järvi (jajarvi at osl.iu.edu) +// Jeremiah Willcock (jewillco at osl.iu.edu) +// Andrew Lumsdaine (lums at osl.iu.edu) // #include diff --git a/test/enable_if_lazy_test.cpp b/test/enable_if_lazy_test.cpp index 4587623..526f8a2 100644 --- a/test/enable_if_lazy_test.cpp +++ b/test/enable_if_lazy_test.cpp @@ -4,9 +4,9 @@ // // See the file enable_if_LICENSE for licensing conditions. // -// Authors: Jaakko Järvi (jajarvi@osl.iu.edu) -// Jeremiah Willcock (jewillco@osl.iu.edu) -// Andrew Lumsdaine (lums@osl.iu.edu) +// Authors: Jaakko Järvi (jajarvi at osl.iu.edu) +// Jeremiah Willcock (jewillco at osl.iu.edu) +// Andrew Lumsdaine (lums at osl.iu.edu) // #include diff --git a/test/enable_if_member_templates.cpp b/test/enable_if_member_templates.cpp index 0870759..e675ecf 100644 --- a/test/enable_if_member_templates.cpp +++ b/test/enable_if_member_templates.cpp @@ -4,9 +4,9 @@ // // See the file enable_if_LICENSE for licensing conditions. // -// Authors: Jaakko Järvi (jajarvi@osl.iu.edu) -// Jeremiah Willcock (jewillco@osl.iu.edu) -// Andrew Lumsdaine (lums@osl.iu.edu) +// Authors: Jaakko Järvi (jajarvi at osl.iu.edu) +// Jeremiah Willcock (jewillco at osl.iu.edu) +// Andrew Lumsdaine (lums at osl.iu.edu) // #include diff --git a/test/enable_if_namespace_disambiguation.cpp b/test/enable_if_namespace_disambiguation.cpp index ab4ce7b..ffa48d6 100644 --- a/test/enable_if_namespace_disambiguation.cpp +++ b/test/enable_if_namespace_disambiguation.cpp @@ -4,9 +4,9 @@ // // See the file enable_if_LICENSE for licensing conditions. // -// Authors: Jaakko Järvi (jajarvi@osl.iu.edu) -// Jeremiah Willcock (jewillco@osl.iu.edu) -// Andrew Lumsdaine (lums@osl.iu.edu) +// Authors: Jaakko Järvi (jajarvi at osl.iu.edu) +// Jeremiah Willcock (jewillco at osl.iu.edu) +// Andrew Lumsdaine (lums at osl.iu.edu) // #include diff --git a/test/enable_if_no_disambiguation.cpp b/test/enable_if_no_disambiguation.cpp index e212456..89b3a0b 100644 --- a/test/enable_if_no_disambiguation.cpp +++ b/test/enable_if_no_disambiguation.cpp @@ -4,9 +4,9 @@ // // See the file enable_if_LICENSE for licensing conditions. // -// Authors: Jaakko Järvi (jajarvi@osl.iu.edu) -// Jeremiah Willcock (jewillco@osl.iu.edu) -// Andrew Lumsdaine (lums@osl.iu.edu) +// Authors: Jaakko Järvi (jajarvi at osl.iu.edu) +// Jeremiah Willcock (jewillco at osl.iu.edu) +// Andrew Lumsdaine (lums at osl.iu.edu) // #include diff --git a/test/enable_if_partial_specializations.cpp b/test/enable_if_partial_specializations.cpp index dbb0421..5ace299 100644 --- a/test/enable_if_partial_specializations.cpp +++ b/test/enable_if_partial_specializations.cpp @@ -4,9 +4,9 @@ // // See the file enable_if_LICENSE for licensing conditions. // -// Authors: Jaakko Järvi (jajarvi@osl.iu.edu) -// Jeremiah Willcock (jewillco@osl.iu.edu) -// Andrew Lumsdaine (lums@osl.iu.edu) +// Authors: Jaakko Järvi (jajarvi at osl.iu.edu) +// Jeremiah Willcock (jewillco at osl.iu.edu) +// Andrew Lumsdaine (lums at osl.iu.edu) // #include