projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct schema WRT to 'marc' and 'xslt' elements. These may be mixed
[metaproxy-moved-to-github.git]
/
src
/
filter_load_balance.cpp
diff --git
a/src/filter_load_balance.cpp
b/src/filter_load_balance.cpp
index
57e1123
..
1cd189f
100644
(file)
--- a/
src/filter_load_balance.cpp
+++ b/
src/filter_load_balance.cpp
@@
-1,5
+1,5
@@
-/* $Id: filter_load_balance.cpp,v 1.5 2007-01-04 13:22:56 marc Exp $
- Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_load_balance.cpp,v 1.7 2007-01-25 14:05:54 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
See the LICENSE file for details
*/
See the LICENSE file for details
*/
@@
-11,11
+11,17
@@
#include "filter_load_balance.hpp"
#include "util.hpp"
#include "filter_load_balance.hpp"
#include "util.hpp"
+
#include <boost/thread/mutex.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <yaz/zgdu.h>
#include <boost/thread/mutex.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <yaz/zgdu.h>
+// remove max macro if already defined (defined later in <limits>)
+#ifdef max
+#undef max
+#endif
+
//#include <iostream>
#include <list>
#include <map>
//#include <iostream>
#include <list>
#include <map>