From b617b8b6565f7c87e2bd1e984f9a17d49743634c Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 16 Mar 2013 14:00:11 -0400 Subject: [PATCH 1/2] fix compiling error --- src/client/requestbroker/APIRequest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/requestbroker/APIRequest.h b/src/client/requestbroker/APIRequest.h index 2d41eb6e0..a4fbac230 100644 --- a/src/client/requestbroker/APIRequest.h +++ b/src/client/requestbroker/APIRequest.h @@ -7,7 +7,7 @@ public: APIResultParser * Parser; std::string URL; void * HTTPContext; - APIRequest(std::string url, APIResultParser * parser, ListenerHandle listener = ListenerHandle(0, 0)); + APIRequest(std::string url, APIResultParser * parser, ListenerHandle listener = ListenerHandle(0, (RequestListener*)NULL)); virtual RequestBroker::ProcessResponse Process(RequestBroker & rb); virtual ~APIRequest(); virtual void Cleanup(); From d357fcdc36e931d2f561fc8e684618d572a35e6d Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sun, 17 Mar 2013 12:21:45 -0400 Subject: [PATCH 2/2] add back bounds check to DTEC/TSNS where needed, change VIBR back to 5x5 loop checks a better way to change it to 3x3 may have to be found that has the same ratios, other elements like WATRs have their rates changed too --- src/simulation/elements/DTEC.cpp | 2 +- src/simulation/elements/TSNS.cpp | 2 +- src/simulation/elements/VIBR.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/simulation/elements/DTEC.cpp b/src/simulation/elements/DTEC.cpp index 69218e6df..71bbf8b59 100644 --- a/src/simulation/elements/DTEC.cpp +++ b/src/simulation/elements/DTEC.cpp @@ -75,7 +75,7 @@ int Element_DTEC::update(UPDATE_FUNC_ARGS) } for (rx=-rd; rx=0 && y+ry>=0 && x+rx=0 && y+ry>=0 && x+rxcreate_part(i, x, y, PT_EXOT); }