Changeset 19512

Timestamp:

11/14/06 13:37:48 (2 years ago)

Author:

patrick

Message:

Merges from the trunk:

r19068: Add Python.h wrapper to prevent python from automatically using

and trying to link against.

r19235: Use native line endings [for wrap_python.h], and do not make

[it] executable.

r19236: Spell "Boost.Python" correctly [in wrap_python.h].

r19237: Removed trailing whitespace [from wrap_python.h].

r19511: Removed commented out #include [in InterpreterGuard?.h].

Files:

• PyJuggler/branches/1.0/pyjutil/InterpreterGuard.h (modified) (1 diff)
• PyJuggler/branches/1.0/pyjutil/wrap_python.h (copied) (copied from PyJuggler/trunk/pyjutil/wrap_python.h) (3 diffs, 2 props)

PyJuggler/branches/1.0/pyjutil/InterpreterGuard.h

@@ -6 +6 @@
-#define _PYJUGGLER_INTERPRETER_GUARD_H_
-
-<Python.h>
+"wrap_python.h"
-
-#include <vpr/vpr.h>

PyJuggler/branches/1.0/pyjutil/wrap_python.h

@@ -5 +5 @@
-// Based on: boost/python/detail/wrap_python.hpp from Boost.Python libary.
-//
-boost.python just go ahead and include the file from boost.python
-
+Boost.Python just go ahead and include the file from
+Boost.python
-
-//  This file serves as a wrapper around <Python.h> which allows it to be
@@ -20 +20 @@
-#ifdef _DEBUG
-# ifndef PYJUTIL_DEBUG_PYTHON
-  
+
-    // VC8.0 will complain if system headers are #included both with
-    // and without _DEBUG defined, so we have to #include all the
@@ -61 +61 @@
-# pragma warning(disable:4786)
-#endif
-
-