Changeset 1421:8b5bb39b62b3
- Timestamp:
- 01/05/2010 12:43:22 AM (8 months ago)
- Author:
- niam
- Branch:
- default
- Message:
-
fix compilation errors and warnings
- Location:
- sources
- Files:
-
Legend:
- Unmodified
- Added
- Removed
-
|
r1420
|
r1421
|
|
| 18 | 18 | void |
| 19 | 19 | hook(xexec::__collected_data__ *odata, |
| 20 | | short type, |
| | 20 | short type UNUSED, |
| 21 | 21 | short operation, |
| 22 | | void *udata) |
| | 22 | void *udata UNUSED) |
| 23 | 23 | { |
| 24 | 24 | sql::constructor::__collected_data__ *sql = (sql::constructor::__collected_data__ *)odata; |
-
|
r1420
|
r1421
|
|
| 19 | 19 | void |
| 20 | 20 | hook(xexec::__collected_data__ *odata, |
| 21 | | short type, |
| | 21 | short type UNUSED, |
| 22 | 22 | short operation, |
| 23 | | void *udata) |
| | 23 | void *udata UNUSED) |
| 24 | 24 | { |
| 25 | 25 | sql::constructor::__collected_data__ *sql = (sql::constructor::__collected_data__ *)odata; |
-
|
r1413
|
r1421
|
|
| 19 | 19 | void |
| 20 | 20 | hook(xexec::__collected_data__ *odata, |
| 21 | | short type, |
| | 21 | short type UNUSED, |
| 22 | 22 | short operation, |
| 23 | | void *udata) |
| | 23 | void *udata UNUSED) |
| 24 | 24 | { |
| 25 | 25 | sql::constructor::__collected_data__ *sql = (sql::constructor::__collected_data__ *)odata; |
-
|
r1413
|
r1421
|
|
| 19 | 19 | void |
| 20 | 20 | hook(xexec::__collected_data__ *odata, |
| 21 | | short type, |
| | 21 | short type UNUSED, |
| 22 | 22 | short operation, |
| 23 | | void *udata) |
| | 23 | void *udata UNUSED) |
| 24 | 24 | { |
| 25 | 25 | sql::constructor::__collected_data__ *sql = (sql::constructor::__collected_data__ *)odata; |
-
|
r1406
|
r1421
|
|
| 22 | 22 | void |
| 23 | 23 | hook(xexec::__collected_data__ *odata, |
| 24 | | short type, |
| | 24 | short type UNUSED, |
| 25 | 25 | short operation, |
| 26 | | void *udata) |
| | 26 | void *udata UNUSED) |
| 27 | 27 | { |
| 28 | 28 | image::__collected_data__ *imData = (image::__collected_data__ *)odata; |
-
|
r1406
|
r1421
|
|
| 19 | 19 | void |
| 20 | 20 | hook(xexec::__collected_data__ *odata, |
| 21 | | short type, |
| 22 | | short operation, |
| 23 | | void *udata) |
| | 21 | short type UNUSED, |
| | 22 | short operation UNUSED, |
| | 23 | void *udata UNUSED) |
| 24 | 24 | { |
| 25 | 25 | io::channel::__collected_data__ *st = (io::channel::__collected_data__ *)odata; |
-
|
r1406
|
r1421
|
|
| 17 | 17 | void |
| 18 | 18 | hook(xexec::__collected_data__ *odata, |
| 19 | | short type, |
| | 19 | short type UNUSED, |
| 20 | 20 | short operation, |
| 21 | | void *udata) |
| | 21 | void *udata UNUSED) |
| 22 | 22 | { |
| 23 | 23 | io::channel::__collected_data__ *st = (io::channel::__collected_data__ *)odata; |
-
|
r1406
|
r1421
|
|
| 86 | 86 | handler(const dodoString &method, |
| 87 | 87 | const dodoArray<value> &values, |
| 88 | | const void *idata, |
| 89 | | void *odata) |
| | 88 | const void *idata UNUSED, |
| | 89 | void *odata UNUSED) |
| 90 | 90 | { |
| 91 | 91 | response resp; |
-
|
r1406
|
r1421
|
|
| 62 | 62 | |
| 63 | 63 | virtual unsigned long |
| 64 | | _write(const char * const data) const |
| | 64 | _write(const char * const data UNUSED) const |
| 65 | 65 | { |
| 66 | 66 | throw dodoString("Not implemented"); |
-
|
r1406
|
r1421
|
|
| 86 | 86 | handler(const dodoString &method, |
| 87 | 87 | const dodoArray<value> &values, |
| 88 | | const void *idata, |
| 89 | | void *odata) |
| | 88 | const void *idata UNUSED, |
| | 89 | void *odata UNUSED) |
| 90 | 90 | { |
| 91 | 91 | response resp; |
-
|
r1406
|
r1421
|
|
| 63 | 63 | |
| 64 | 64 | virtual unsigned long |
| 65 | | _write(const char * const data) const |
| | 65 | _write(const char * const data UNUSED) const |
| 66 | 66 | { |
| 67 | 67 | throw dodoString("Not implemented"); |
-
|
r1406
|
r1421
|
|
| 16 | 16 | { |
| 17 | 17 | void |
| 18 | | handler(int module, |
| | 18 | handler(int module UNUSED, |
| 19 | 19 | dodo::exception::basic *ex, |
| 20 | | void *data) |
| | 20 | void *data UNUSED) |
| 21 | 21 | { |
| 22 | 22 | std::cout << "module:handler: " << ex->errStr << std::endl; |
| … |
… |
|
| 25 | 25 | |
| 26 | 26 | dodo::exception::basic::__module__ |
| 27 | | initExceptionBasicModule(void *data) |
| | 27 | initExceptionBasicModule(void *data UNUSED) |
| 28 | 28 | { |
| 29 | 29 | dodo::exception::basic::__module__ module = { |
-
|
r1406
|
r1421
|
|
| 15 | 15 | |
| 16 | 16 | void |
| 17 | | handler(int module, |
| | 17 | handler(int module UNUSED, |
| 18 | 18 | dodo::exception::basic *ex, |
| 19 | | void *data) |
| | 19 | void *data UNUSED) |
| 20 | 20 | { |
| 21 | 21 | cout << "baseHandler: " << (dodoString) * ex << endl << ex->backtrace() << endl; |
-
|
r1406
|
r1421
|
|
| 17 | 17 | { |
| 18 | 18 | void |
| 19 | | hook(xexec::__collected_data__ *odata, |
| 20 | | short type, |
| 21 | | short operation, |
| 22 | | void *udata) |
| | 19 | hook(xexec::__collected_data__ *odata UNUSED, |
| | 20 | short type UNUSED, |
| | 21 | short operation UNUSED, |
| | 22 | void *udata UNUSED) |
| 23 | 23 | { |
| 24 | 24 | #ifndef IO_WO_XEXEC |
| … |
… |
|
| 35 | 35 | |
| 36 | 36 | void |
| 37 | | empty(xexec::__collected_data__ *odata, |
| 38 | | short int type, |
| 39 | | void *udata) |
| | 37 | empty(xexec::__collected_data__ *odata UNUSED, |
| | 38 | short int type UNUSED, |
| | 39 | void *udata UNUSED) |
| 40 | 40 | { |
| 41 | 41 | std::cout << "empty hook\n"; |
-
|
r1420
|
r1421
|
|
| 57 | 57 | //------------------------------------------------------------------- |
| 58 | 58 | |
| 59 | | server::server(server &s) |
| 60 | | #ifndef IO_WO_XEXEC |
| 61 | | : xexec(s), |
| 62 | | collectedData(this, xexec::OBJECT_IONETWORKSERVER) |
| | 59 | #ifndef IO_WO_XEXEC |
| | 60 | server::server(server &s) : xexec(s), |
| | 61 | collectedData(this, xexec::OBJECT_IONETWORKSERVER) |
| 63 | 62 | #else |
| 64 | 63 | server::server(server &) |