minor cleanups in common.h; updated author info and copyright year

example/example.cpp

@@ -1,7 +1,7 @@
 /*
     example/example.cpp -- pybind example plugin
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

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 <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example10.cpp

@@ -2,7 +2,7 @@
     example/example10.cpp -- auto-vectorize functions over NumPy array
     arguments
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example11.cpp

@@ -1,7 +1,7 @@
 /*
     example/example11.cpp -- keyword arguments and default values
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example12.cpp

@@ -1,7 +1,7 @@
 /*
     example/example12.cpp -- overriding virtual functions from Python
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

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 <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example14.cpp

@@ -1,7 +1,7 @@
 /*
     example/example14.cpp -- opaque types, passing void pointers
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example15.cpp

@@ -1,7 +1,7 @@
 /*
     example/example15.cpp -- pickle support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example16.cpp

@@ -1,7 +1,7 @@
 /*
     example/example16.cpp -- automatic upcasting for polymorphic types
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

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 <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example3.cpp

@@ -1,7 +1,7 @@
 /*
     example/example3.cpp -- operator overloading
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example4.cpp

@@ -1,7 +1,7 @@
 /*
     example/example4.cpp -- global constants and functions, enumerations, raw byte strings
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example5.cpp

@@ -2,7 +2,7 @@
     example/example5.cpp -- inheritance, callbacks, acquiring and releasing the
     global interpreter lock
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example6.cpp

@@ -2,7 +2,7 @@
     example/example6.cpp -- supporting Pythons' sequence protocol, iterators,
     etc.
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example7.cpp

@@ -1,7 +1,7 @@
 /*
     example/example7.cpp -- supporting Pythons' buffer protocol
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

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 <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/example9.cpp

@@ -2,7 +2,7 @@
     example/example9.cpp -- nested modules, importing modules, and
                             internal references
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

example/issues.cpp

@@ -1,7 +1,7 @@
 /*
     example/issues.cpp -- collection of testcases for miscellaneous issues
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

include/pybind11/attr.h

@@ -2,7 +2,7 @@
     pybind11/pybind11.h: Infrastructure for processing custom
     type and function attributes
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

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 <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

include/pybind11/common.h

@@ -1,7 +1,7 @@
 /*
     pybind11/common.h -- Basic macros
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     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
 

include/pybind11/complex.h

@@ -1,7 +1,7 @@
 /*
     pybind11/complex.h: Complex number support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

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 <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

include/pybind11/functional.h

@@ -1,7 +1,7 @@
 /*
     pybind11/functional.h: std::function<> support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

include/pybind11/numpy.h

@@ -1,7 +1,7 @@
 /*
     pybind11/numpy.h: Basic NumPy support, auto-vectorization support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

include/pybind11/operators.h

@@ -1,7 +1,7 @@
 /*
     pybind11/operator.h: Metatemplates for operator overloading
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

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 <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

include/pybind11/pytypes.h

@@ -1,7 +1,7 @@
 /*
     pybind11/typeid.h: Convenience wrapper classes for basic Python types
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

include/pybind11/stl.h

@@ -1,7 +1,7 @@
 /*
     pybind11/complex.h: Complex number support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

include/pybind11/typeid.h

@@ -1,7 +1,7 @@
 /*
     pybind11/typeid.h: Compiler-independent access to type identifiers
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.

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'],