diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
| commit | 07fc59e19636a4fc97a18b2038f3fe1c72a94000 (patch) | |
| tree | 79d4a6239d81b2ccb4752d4f5ca25e0a7d3b4d4b /engine/SCons/Scanner/C.py | |
| parent | 7f642861f3946d4241cbd668de258293ba92767a (diff) | |
| parent | 340d57481935334465037d97c0db1555b70c0eb1 (diff) | |
Merge commit 'upstream/2.0.0'
Diffstat (limited to 'engine/SCons/Scanner/C.py')
| -rw-r--r-- | engine/SCons/Scanner/C.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/SCons/Scanner/C.py b/engine/SCons/Scanner/C.py index a8f4be9..598d3b1 100644 --- a/engine/SCons/Scanner/C.py +++ b/engine/SCons/Scanner/C.py @@ -27,7 +27,7 @@ This module implements the depenency scanner for C/C++ code. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/C.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Scanner/C.py 5023 2010/06/14 22:05:46 scons" import SCons.Node.FS import SCons.Scanner @@ -44,7 +44,7 @@ class SConsCPPScanner(SCons.cpp.PreProcessor): missing. """ def __init__(self, *args, **kw): - apply(SCons.cpp.PreProcessor.__init__, (self,)+args, kw) + SCons.cpp.PreProcessor.__init__(self, *args, **kw) self.missing = [] def initialize_result(self, fname): self.result = SCons.Util.UniqueList([fname]) @@ -81,7 +81,7 @@ def dictify_CPPDEFINES(env): return {cppdefines : None} return cppdefines -class SConsCPPScannerWrapper: +class SConsCPPScannerWrapper(object): """ The SCons wrapper around a cpp.py scanner. |