comparison OrthancServer/ServerIndex.cpp @ 947:c2c28dd17e87 query-retrieve

integration mainline -> query-retrieve
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Jun 2014 12:09:38 +0200
parents 67e6400fca03 84513f2ee1f3
children 111e23bb4904
comparison
equal deleted inserted replaced
758:67e6400fca03 947:c2c28dd17e87
28 * You should have received a copy of the GNU General Public License 28 * You should have received a copy of the GNU General Public License
29 * along with this program. If not, see <http://www.gnu.org/licenses/>. 29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
30 **/ 30 **/
31 31
32 32
33 #include "PrecompiledHeadersServer.h"
33 #include "ServerIndex.h" 34 #include "ServerIndex.h"
34 35
35 #ifndef NOMINMAX 36 #ifndef NOMINMAX
36 #define NOMINMAX 37 #define NOMINMAX
37 #endif 38 #endif
1495 } 1496 }
1496 1497
1497 1498
1498 void ServerIndex::UnstableResourcesMonitorThread(ServerIndex* that) 1499 void ServerIndex::UnstableResourcesMonitorThread(ServerIndex* that)
1499 { 1500 {
1500 int stableAge = GetGlobalIntegerParameter("StableAge", 60); 1501 int stableAge = Configuration::GetGlobalIntegerParameter("StableAge", 60);
1501 if (stableAge <= 0) 1502 if (stableAge <= 0)
1502 { 1503 {
1503 stableAge = 60; 1504 stableAge = 60;
1504 } 1505 }
1505 1506