From 12ca84d0b6c31a209928353945ed48c365746afd Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 17 Sep 2010 15:44:57 +0000 Subject: [PATCH] PGSQL: Autoreconnect improvement git-svn-id: svn://ultimatepp.org/upp/trunk@2699 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/src.tpp/Array$en-us.tpp | 8 +++++--- uppsrc/Core/src.tpp/Vector$en-us.tpp | 8 +++++--- uppsrc/CtrlCore/Ctrl.cpp | 2 +- uppsrc/CtrlCore/CtrlCore.h | 4 ++-- uppsrc/CtrlCore/Win32Proc.cpp | 8 ++++---- uppsrc/PostgreSQL/PostgreSQL.cpp | 2 -- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/uppsrc/Core/src.tpp/Array$en-us.tpp b/uppsrc/Core/src.tpp/Array$en-us.tpp index 600d64d5e..0e86b8e0a 100644 --- a/uppsrc/Core/src.tpp/Array$en-us.tpp +++ b/uppsrc/Core/src.tpp/Array$en-us.tpp @@ -91,21 +91,23 @@ of type derived from T.&] element.&] [s3;%- &] [s4;%- &] -[s5;:Array`:`:Add`(const T`&`):%- [@(0.0.255) void]_[* Add]([@(0.0.255) const]_[*@4 T][@(0.0.255) `& +[s5;:Array`:`:Add`(const T`&`):%- [*@4 T][@(0.0.255) `&]_[* Add]([@(0.0.255) const]_[*@4 T][@(0.0.255) `& ]_[*@3 x])&] [s2; Adds a new element with specified value to the Array.&] [s6; Requires T to have deep copy constructor.&] [s6; Invalidates iterators to the Array.&] [s7; [*C@3 x]-|The value that is copied to newly created element.&] +[s7; [*/ Return value]-|Reference to new element in Array.&] [s3;%- &] [s4;%- &] -[s5;:Array`:`:AddPick`(pick`_ T`&`):%- [@(0.0.255) void]_[* AddPick]([@(0.128.128) pick`_]_ -[*@4 T][@(0.0.255) `&]_[*@3 x])&] +[s5;:Array`:`:AddPick`(pick`_ T`&`):%- [*@4 T][@(0.0.255) `&]_[* AddPick]([@(0.128.128) pick`_ +]_[*@4 T][@(0.0.255) `&]_[*@3 x])&] [s2; Adds new element to the Array and picks value of parameter to it. &] [s6; Requires T to have pick constructor.&] [s6; Invalidates iterators to the Array.&] [s7; [*C@3 x]-|Source instance of T that is to be picked.&] +[s7; [*/ Return value]-|Reference to new element in Array.&] [s3;%- &] [s4;%- &] [s5;:Array`:`:Add`(T`*`):%- [*@4 T][@(0.0.255) `&]_[* Add]([*@4 T]_`*[*@3 newt])&] diff --git a/uppsrc/Core/src.tpp/Vector$en-us.tpp b/uppsrc/Core/src.tpp/Vector$en-us.tpp index c070f212f..35f7fd4ba 100644 --- a/uppsrc/Core/src.tpp/Vector$en-us.tpp +++ b/uppsrc/Core/src.tpp/Vector$en-us.tpp @@ -76,21 +76,23 @@ constructor.&] element.&] [s3;%- &] [s4;%- &] -[s5;:Vector`:`:Add`(const T`&`):%- [@(0.0.255) void]_[* Add]([@(0.0.255) const]_[*@4 T][@(0.0.255) `& +[s5;:Vector`:`:Add`(const T`&`):%- [*@4 T][@(0.0.255) `&]_[* Add]([@(0.0.255) const]_[*@4 T][@(0.0.255) `& ]_[*@3 x])&] [s2; Adds new element with specified value to Vector.&] [s6; Requires T to have deep copy constructor.&] [s6; Invalidates iterators and references to Vector.&] [s7; [*C@3 x]-|The value that is copied to newly created element.&] +[s7; [*/ Return value]-|Reference to new element in Vector.&] [s3;%- &] [s4;%- &] -[s5;:Vector`:`:AddPick`(pick`_ T`&`):%- [@(0.0.255) void]_[* AddPick]([@(0.128.128) pick`_]_ -[*@4 T][@(0.0.255) `&]_[*@3 x])&] +[s5;:Vector`:`:AddPick`(pick`_ T`&`):%- [*@4 T][@(0.0.255) `&]_[* AddPick]([@(0.128.128) pick +`_]_[*@4 T][@(0.0.255) `&]_[*@3 x])&] [s2; Adds new element to Vector and picks value of parameter to it. &] [s6; Requires T to have pick constructor.&] [s6; Invalidates iterators and references to Vector.&] [s7; [*C@3 x]-|Source instance of T that is to be picked.&] +[s7; [*/ Return value]-|Reference to new element in Vector&] [s3;%- &] [s4;%- &] [s5;:Vector`:`:AddN`(int`):%- [@(0.0.255) void]_[* AddN]([@(0.0.255) int]_[*@3 n])&] diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp index aa3b93eed..b5c797597 100644 --- a/uppsrc/CtrlCore/Ctrl.cpp +++ b/uppsrc/CtrlCore/Ctrl.cpp @@ -39,7 +39,7 @@ int Ctrl::LoopLevel; bool Ctrl::MemoryCheck; -bool Ctrl::Painting; +bool Ctrl::painting; void Ctrl::SetData(const Value&) {} Value Ctrl::GetData() const { return Value(); } diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h index 9d29a73c8..4b19b85bc 100644 --- a/uppsrc/CtrlCore/CtrlCore.h +++ b/uppsrc/CtrlCore/CtrlCore.h @@ -473,7 +473,7 @@ private: static bool mouseinview; static bool mouseinframe; static bool globalbackpaint; - static bool Painting; + static bool painting; static int LoopLevel; static Ctrl *LoopCtrl; static int64 eventid; @@ -1135,7 +1135,7 @@ public: void RefreshFrame(int x, int y, int cx, int cy); void RefreshFrame(); - static bool IsPainting() { return Painting; } + static bool IsPainting() { return painting; } void ScrollView(const Rect& r, int dx, int dy); void ScrollView(int x, int y, int cx, int cy, int dx, int dy); diff --git a/uppsrc/CtrlCore/Win32Proc.cpp b/uppsrc/CtrlCore/Win32Proc.cpp index 73cb13b77..417b69c26 100644 --- a/uppsrc/CtrlCore/Win32Proc.cpp +++ b/uppsrc/CtrlCore/Win32Proc.cpp @@ -69,7 +69,7 @@ void SetWinceMouse(HWND hwnd, LPARAM lparam) {} void AvoidPaintingCheck__() { - Ctrl::Painting = false; + Ctrl::painting = false; } bool PassWindowsKey(int wParam); @@ -77,7 +77,7 @@ bool PassWindowsKey(int wParam); LRESULT Ctrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) { GuiLock __; eventid++; - ASSERT_(!Painting, "WindowProc invoked while in Paint routine"); + ASSERT_(!painting, "WindowProc invoked while in Paint routine"); // LLOG("Ctrl::WindowProc(" << message << ") in " << ::Name(this) << ", focus " << (void *)::GetFocus()); Ptr _this = this; HWND hwnd = GetHWND(); @@ -117,11 +117,11 @@ LRESULT Ctrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) { } #endif #ifdef _DEBUG - Painting = true; + painting = true; #endif UpdateArea(draw, Rect(ps.rcPaint)); #ifdef _DEBUG - Painting = false; + painting = false; #endif #ifndef PLATFORM_WINCE if(draw.PaletteMode() && SystemDraw::AutoPalette()) diff --git a/uppsrc/PostgreSQL/PostgreSQL.cpp b/uppsrc/PostgreSQL/PostgreSQL.cpp index 858f6c617..f05f10cb2 100644 --- a/uppsrc/PostgreSQL/PostgreSQL.cpp +++ b/uppsrc/PostgreSQL/PostgreSQL.cpp @@ -363,8 +363,6 @@ bool PostgreSQLSession::ConnectionOK() bool PostgreSQLSession::ReOpen() { - DLOG("Reopen!"); -// Open(conns); PQreset(conn); if(PQstatus(conn) != CONNECTION_OK) {