From 8cb6cb33ef10257a1f45e038897c91a558745943 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Sun, 17 Apr 2016 20:21:41 +0200 Subject: [PATCH] minor cleanups in common.h; updated author info and copyright year --- example/example.cpp | 2 +- example/example1.cpp | 2 +- example/example10.cpp | 2 +- example/example11.cpp | 2 +- example/example12.cpp | 2 +- example/example13.cpp | 2 +- example/example14.cpp | 2 +- example/example15.cpp | 2 +- example/example16.cpp | 2 +- example/example2.cpp | 2 +- example/example3.cpp | 2 +- example/example4.cpp | 2 +- example/example5.cpp | 2 +- example/example6.cpp | 2 +- example/example7.cpp | 2 +- example/example8.cpp | 2 +- example/example9.cpp | 2 +- example/issues.cpp | 2 +- include/pybind11/attr.h | 2 +- include/pybind11/cast.h | 2 +- include/pybind11/common.h | 10 +++++----- include/pybind11/complex.h | 2 +- include/pybind11/descr.h | 2 +- include/pybind11/functional.h | 2 +- include/pybind11/numpy.h | 2 +- include/pybind11/operators.h | 2 +- include/pybind11/pybind11.h | 2 +- include/pybind11/pytypes.h | 2 +- include/pybind11/stl.h | 2 +- include/pybind11/typeid.h | 2 +- setup.py | 2 +- 31 files changed, 35 insertions(+), 35 deletions(-) diff --git a/example/example.cpp b/example/example.cpp index ba0ff281..34b2df7f 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -1,7 +1,7 @@ /* example/example.cpp -- pybind example plugin - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example1.cpp b/example/example1.cpp index 2a0038d8..dd651fba 100644 --- a/example/example1.cpp +++ b/example/example1.cpp @@ -2,7 +2,7 @@ example/example1.cpp -- constructors, deconstructors, attribute access, __str__, argument and return value conventions - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example10.cpp b/example/example10.cpp index 1a377e56..09769fee 100644 --- a/example/example10.cpp +++ b/example/example10.cpp @@ -2,7 +2,7 @@ example/example10.cpp -- auto-vectorize functions over NumPy array arguments - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example11.cpp b/example/example11.cpp index e7069def..1a472c9e 100644 --- a/example/example11.cpp +++ b/example/example11.cpp @@ -1,7 +1,7 @@ /* example/example11.cpp -- keyword arguments and default values - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example12.cpp b/example/example12.cpp index 97ba6a83..84b1c358 100644 --- a/example/example12.cpp +++ b/example/example12.cpp @@ -1,7 +1,7 @@ /* example/example12.cpp -- overriding virtual functions from Python - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example13.cpp b/example/example13.cpp index 782db310..6c1b8765 100644 --- a/example/example13.cpp +++ b/example/example13.cpp @@ -2,7 +2,7 @@ example/example13.cpp -- keep_alive modifier (pybind11's version of Boost.Python's with_custodian_and_ward / with_custodian_and_ward_postcall) - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example14.cpp b/example/example14.cpp index abae0214..a7d285a0 100644 --- a/example/example14.cpp +++ b/example/example14.cpp @@ -1,7 +1,7 @@ /* example/example14.cpp -- opaque types, passing void pointers - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example15.cpp b/example/example15.cpp index bfc75268..acdd3682 100644 --- a/example/example15.cpp +++ b/example/example15.cpp @@ -1,7 +1,7 @@ /* example/example15.cpp -- pickle support - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example16.cpp b/example/example16.cpp index 350435f5..7b676a9d 100644 --- a/example/example16.cpp +++ b/example/example16.cpp @@ -1,7 +1,7 @@ /* example/example16.cpp -- automatic upcasting for polymorphic types - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example2.cpp b/example/example2.cpp index 2d49286b..9b91baaa 100644 --- a/example/example2.cpp +++ b/example/example2.cpp @@ -2,7 +2,7 @@ example/example2.cpp2 -- singleton design pattern, static functions and variables, passing and interacting with Python types - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example3.cpp b/example/example3.cpp index 3b3a6253..af956b13 100644 --- a/example/example3.cpp +++ b/example/example3.cpp @@ -1,7 +1,7 @@ /* example/example3.cpp -- operator overloading - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example4.cpp b/example/example4.cpp index e673c4a8..281eafed 100644 --- a/example/example4.cpp +++ b/example/example4.cpp @@ -1,7 +1,7 @@ /* example/example4.cpp -- global constants and functions, enumerations, raw byte strings - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example5.cpp b/example/example5.cpp index ad24ef06..4ba6a34f 100644 --- a/example/example5.cpp +++ b/example/example5.cpp @@ -2,7 +2,7 @@ example/example5.cpp -- inheritance, callbacks, acquiring and releasing the global interpreter lock - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example6.cpp b/example/example6.cpp index 89db2fba..26552b7e 100644 --- a/example/example6.cpp +++ b/example/example6.cpp @@ -2,7 +2,7 @@ example/example6.cpp -- supporting Pythons' sequence protocol, iterators, etc. - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example7.cpp b/example/example7.cpp index b68b5539..415b0978 100644 --- a/example/example7.cpp +++ b/example/example7.cpp @@ -1,7 +1,7 @@ /* example/example7.cpp -- supporting Pythons' buffer protocol - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example8.cpp b/example/example8.cpp index f492588b..dbdd4218 100644 --- a/example/example8.cpp +++ b/example/example8.cpp @@ -2,7 +2,7 @@ example/example8.cpp -- binding classes with custom reference counting, implicit conversions between types - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/example9.cpp b/example/example9.cpp index f64b539a..ca75ecc7 100644 --- a/example/example9.cpp +++ b/example/example9.cpp @@ -2,7 +2,7 @@ example/example9.cpp -- nested modules, importing modules, and internal references - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/example/issues.cpp b/example/issues.cpp index 09547aed..b0f3a6be 100644 --- a/example/issues.cpp +++ b/example/issues.cpp @@ -1,7 +1,7 @@ /* example/issues.cpp -- collection of testcases for miscellaneous issues - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/attr.h b/include/pybind11/attr.h index 759feed7..86face3a 100644 --- a/include/pybind11/attr.h +++ b/include/pybind11/attr.h @@ -2,7 +2,7 @@ pybind11/pybind11.h: Infrastructure for processing custom type and function attributes - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h index 6a9ad7c2..8625d8ac 100644 --- a/include/pybind11/cast.h +++ b/include/pybind11/cast.h @@ -2,7 +2,7 @@ pybind11/cast.h: Partial template specializations to cast between C++ and Python types - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/common.h b/include/pybind11/common.h index 15047b85..9739cdac 100644 --- a/include/pybind11/common.h +++ b/include/pybind11/common.h @@ -1,7 +1,7 @@ /* pybind11/common.h -- Basic macros - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. @@ -39,7 +39,7 @@ # pragma warning(push) # pragma warning(disable: 4510 4610 4512 4005) # if _DEBUG -# define _DEBUG_MARKER +# define PYBIND11_DEBUG_MARKER # undef _DEBUG # endif #endif @@ -58,10 +58,10 @@ #endif #if defined(_MSC_VER) -# if defined(_DEBUG_MARKER) +# if defined(PYBIND11_DEBUG_MARKER) # define _DEBUG -# undef _DEBUG_MARKER -#endif +# undef PYBIND11_DEBUG_MARKER +# endif # pragma warning(pop) #endif diff --git a/include/pybind11/complex.h b/include/pybind11/complex.h index a140f6fe..ba0b2974 100644 --- a/include/pybind11/complex.h +++ b/include/pybind11/complex.h @@ -1,7 +1,7 @@ /* pybind11/complex.h: Complex number support - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/descr.h b/include/pybind11/descr.h index b040014d..1b65f68c 100644 --- a/include/pybind11/descr.h +++ b/include/pybind11/descr.h @@ -2,7 +2,7 @@ pybind11/descr.h: Helper type for concatenating type signatures either at runtime (C++11) or compile time (C++14) - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/functional.h b/include/pybind11/functional.h index f00a6037..50748333 100644 --- a/include/pybind11/functional.h +++ b/include/pybind11/functional.h @@ -1,7 +1,7 @@ /* pybind11/functional.h: std::function<> support - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/numpy.h b/include/pybind11/numpy.h index 3386876e..38d30bfb 100644 --- a/include/pybind11/numpy.h +++ b/include/pybind11/numpy.h @@ -1,7 +1,7 @@ /* pybind11/numpy.h: Basic NumPy support, auto-vectorization support - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/operators.h b/include/pybind11/operators.h index b10bfe30..305cd2cd 100644 --- a/include/pybind11/operators.h +++ b/include/pybind11/operators.h @@ -1,7 +1,7 @@ /* pybind11/operator.h: Metatemplates for operator overloading - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h index a9707c48..f653ba97 100644 --- a/include/pybind11/pybind11.h +++ b/include/pybind11/pybind11.h @@ -2,7 +2,7 @@ pybind11/pybind11.h: Main header file of the C++11 python binding generator library - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/pytypes.h b/include/pybind11/pytypes.h index c7f109cd..b8115522 100644 --- a/include/pybind11/pytypes.h +++ b/include/pybind11/pytypes.h @@ -1,7 +1,7 @@ /* pybind11/typeid.h: Convenience wrapper classes for basic Python types - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/stl.h b/include/pybind11/stl.h index 97ccdbc8..39adc7e6 100644 --- a/include/pybind11/stl.h +++ b/include/pybind11/stl.h @@ -1,7 +1,7 @@ /* pybind11/complex.h: Complex number support - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/include/pybind11/typeid.h b/include/pybind11/typeid.h index b395110f..c903fb14 100644 --- a/include/pybind11/typeid.h +++ b/include/pybind11/typeid.h @@ -1,7 +1,7 @@ /* pybind11/typeid.h: Compiler-independent access to type identifiers - Copyright (c) 2015 Wenzel Jakob + Copyright (c) 2016 Wenzel Jakob All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. diff --git a/setup.py b/setup.py index 362b753b..7562860b 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( version=__version__, description='Seamless operability between C++11 and Python', author='Wenzel Jakob', - author_email='wenzel@inf.ethz.ch', + author_email='wenzel.jakob@epfl.ch', url='https://github.com/wjakob/pybind11', download_url='https://github.com/wjakob/pybind11/tarball/v' + __version__, packages=['pybind11'],