paul@91 | 1 | --- a/shedskin/lib/builtin.hpp |
paul@91 | 2 | +++ b/shedskin/lib/builtin.hpp |
paul@91 | 3 | @@ -1203,10 +1203,10 @@ |
paul@91 | 4 | #include "builtin/list.hpp" |
paul@91 | 5 | #include "builtin/tuple.hpp" |
paul@91 | 6 | #include "builtin/str.hpp" |
paul@91 | 7 | +#include "builtin/math.hpp" |
paul@91 | 8 | #include "builtin/dict.hpp" |
paul@91 | 9 | #include "builtin/set.hpp" |
paul@91 | 10 | #include "builtin/file.hpp" |
paul@91 | 11 | -#include "builtin/math.hpp" |
paul@91 | 12 | #include "builtin/format.hpp" |
paul@91 | 13 | #include "builtin/function.hpp" |
paul@91 | 14 | #include "builtin/complex.hpp" |
paul@91 | 15 | --- a/shedskin/lib/collections.hpp |
paul@91 | 16 | +++ b/shedskin/lib/collections.hpp |
paul@91 | 17 | @@ -237,7 +237,7 @@ |
paul@91 | 18 | V __getitem__(K key) { |
paul@91 | 19 | register long hash = hasher<K>(key); |
paul@91 | 20 | register dictentry<K, V> *entry; |
paul@91 | 21 | - entry = lookup(key, hash); |
paul@91 | 22 | + entry = this->lookup(key, hash); |
paul@91 | 23 | if (entry->use != active) |
paul@91 | 24 | return __missing__(key); |
paul@91 | 25 | return entry->value; |
paul@91 | 26 | @@ -255,10 +255,10 @@ |
paul@91 | 27 | void *__addtoitem__(K key, V value) { /* XXX */ |
paul@91 | 28 | register long hash = hasher<K>(key); |
paul@91 | 29 | register dictentry<K, V> *entry; |
paul@91 | 30 | - entry = lookup(key, hash); |
paul@91 | 31 | + entry = this->lookup(key, hash); |
paul@91 | 32 | if (entry->use != active) { |
paul@91 | 33 | if(func) |
paul@91 | 34 | - __setitem__(key, __add(func(), value)); |
paul@91 | 35 | + this->__setitem__(key, __add(func(), value)); |
paul@91 | 36 | else |
paul@91 | 37 | throw new KeyError(repr(key)); |
paul@91 | 38 | } else |
paul@91 | 39 | @@ -281,7 +281,7 @@ |
paul@91 | 40 | PyObject *iter = PyObject_GetIter(p); |
paul@91 | 41 | while(key = PyIter_Next(iter)) { |
paul@91 | 42 | value = PyDict_GetItem(p, key); |
paul@91 | 43 | - __setitem__(__to_ss<K>(key), __to_ss<V>(value)); |
paul@91 | 44 | + this->__setitem__(__to_ss<K>(key), __to_ss<V>(value)); |
paul@91 | 45 | Py_DECREF(key); |
paul@91 | 46 | } |
paul@91 | 47 | Py_DECREF(iter); |
paul@91 | 48 | --- a/shedskin/lib/os/__init__.cpp |
paul@91 | 49 | +++ b/shedskin/lib/os/__init__.cpp |
paul@91 | 50 | @@ -23,9 +23,7 @@ |
paul@91 | 51 | #include <sysexits.h> |
paul@91 | 52 | #endif |
paul@91 | 53 | |
paul@91 | 54 | -namespace std { |
paul@91 | 55 | #include <unistd.h> |
paul@91 | 56 | -} |
paul@91 | 57 | |
paul@91 | 58 | #ifdef WIN32 |
paul@91 | 59 | #include <windows.h> |
paul@91 | 60 | --- a/shedskin/lib/socket.cpp |
paul@91 | 61 | +++ b/shedskin/lib/socket.cpp |
paul@91 | 62 | @@ -13,6 +13,7 @@ |
paul@91 | 63 | #include "socket.hpp" |
paul@91 | 64 | #include <climits> |
paul@91 | 65 | #include <fcntl.h> |
paul@91 | 66 | +#include <unistd.h> |
paul@91 | 67 | |
paul@91 | 68 | #ifdef WIN32 |
paul@91 | 69 | |