scons fix for lucid

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1589 270642c3-0616-0410-b53a-bc976706d245

diff --git a/senf/Packets/DefaultBundle/ListOptionTypeParser.cti b/senf/Packets/DefaultBundle/ListOptionTypeParser.cti
index 7c0e324..2a3bdec 100644 (file)
--- a/senf/Packets/DefaultBundle/ListOptionTypeParser.cti
+++ b/senf/Packets/DefaultBundle/ListOptionTypeParser.cti
@@ -221,7 +221,7 @@ update(container_type const & c)
         return;
     data_iterator i(AuxPolicy::adjust(c.i(), c.state()));
     data_iterator j(i);
-    for (size_type n(n_); n; --n, std::advance(j, senf::bytes(ElementParser(j,c.state()))));
+    for (size_type n(n_); n; --n, std::advance(j, senf::bytes(ElementParser(j,c.state())))) { ; }
     realAux_ = std::distance(i, j);
     container_size_ = c.data().size();
 }

diff --git a/site_scons/site_init.py b/site_scons/site_init.py
index 088c479..9c2baac 100644 (file)
--- a/site_scons/site_init.py
+++ b/site_scons/site_init.py
@@ -1,9 +1,11 @@
 import os.path, SCons
+import inspect
 
 # SCons is at     #/tools/scons-<v>/engine/SCons/__init__.py
 # site_init is at #/site_scons/site_init.py
 
-sconsbase = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),"tools")
+sconsbase = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(
+    inspect.currentframe().f_code.co_filename))),"tools")
 sconsbase = os.path.join(
     sconsbase,sorted((f for f in os.listdir(sconsbase) if f.startswith("scons-")))[-1])
 sconsengine = os.path.join(sconsbase, 'engine')