Fixed merge related compile errors

2 files changed, 80 insertions, 9 deletions

diff --git a/ACEXML/common/XML_Macros.h b/ACEXML/common/XML_Macros.h
index 028bc590395..50ec6857b3a 100644
--- a/ACEXML/common/XML_Macros.h
+++ b/ACEXML/common/XML_Macros.h
@@ -88,12 +88,12 @@
       throw EXCEPTION
 
 // Throwing an exception when the function reqires a return value.
-# if defined (WIN32) || defined (__HP_aCC)
+# if defined (__HP_aCC)
 #   define ACEXML_THROW_RETURN(EXCEPTION, RETV) \
       do \
         { \
           throw EXCEPTION; \
-          return RETV; \
+	  return RETV; \
         } while (0)
 # else /* WIN32 */
 #   define ACEXML_THROW_RETURN(EXCEPTION,RETV) \
diff --git a/THANKS b/THANKS
index cc3b747fa5e..931b45b7a58 100644
--- a/THANKS
+++ b/THANKS
@@ -1135,7 +1135,7 @@ Mike Anderson <manderson at sonusnet dot com>
 David Singer <David_P_Singer at res dot raytheon dot com>
 Nick Lin <nicklin at vantech dot com dot tw>
 Ron Hashimshony <Ron at bandwiz dot com>
-Max Khon <fjoe at iclub dot nsu dot ru>
+Max Khon <mkhon at swsoft dot com>
 Jonas Nordin <jonas dot nordin at syncom dot se>
 Jonathan Stockdale <Jonathan dot Stockdale at locusdialogue dot com>
 Jean-Francois Daune <Daune at IBA dot be>
@@ -1248,7 +1248,7 @@ Wayne Erchak <wayne at stentor dot com>
 Yew Khong See <seeyk at yahoo dot com>
 Greg Thompson <gregt at ot dot com dot au>
 Mike Pyle <mike dot pyle at burning-glass dot com>
-Kobi Cohen-Arazi <kobi-co at barak-online dot net>
+Kobi Cohen-Arazi <kobi.cohenarazi at gmail dot com>
 Israel Illescas Gomez <illescas at dycsa dot es>
 Brodie Thiesfield <brodie dot thiesfield at activesky dot com>
 Erik Toubro Nielsen <enielsen at mdsproteomics dot dk>
@@ -1724,7 +1724,7 @@ Karim Fodil-Lemelin <kfl at xiphos dot ca>
 Wenlong Tang <tang_long at hotmail dot com>
 Manish Jain <majain at hss dot hns dot com>
 Robin Farine <robin dot farine at acn-group dot ch>
-Roland Schimmack <SC at ProCom dot de>
+Roland Schimmack <Roland dot Schimmack at gmx dot de>
 Roy Pollock <rpollock at ghs dot com>
 Eric Held <Eric dot Held at harris dot com>
 Kees van Marle <kvmarle at remedy dot nl>
@@ -1798,7 +1798,7 @@ Brad Orner <bradley_p_orner at raytheon dot com>
 Michelangelo Nottoli <m dot nottoli at acsys dot it>
 Peter Bekiesch <peter dot bekiesch at dtmgmbh dot de>
 Martin Kaul <mkaul at leuze dot de>
-Gruetzmacher Lukas <gruetzmacher at ais-dresden dot de>
+Lukas Gruetzmacher <gruetzmacher at ais-dresden dot de>
 Robert Schiele <robert dot schiele at t-online dot de>
 Matthew Grosso <mgrosso at acm dot org>
 Akim Boyko <akim at sitech dot com dot ua>
@@ -1995,7 +1995,7 @@ Mark Callaghan <mdcallag at gmail dot com>
 Hanson Lu <suf_lu at yahoo dot com>
 Gavin Yu <songtaoyu at lucent dot com>
 Srikanth Gopal <sriki_666 at yahoo dot com>
-Like Ma <likemartinma at 163 dot com>
+Like Ma <likemartinma at gmail dot com>
 Alvin Msg <alvin dot msg at gmail dot com>
 Angela Ziegenhorn <Angela dot Ziegenhorn at veritas dot com>
 Sam Mesh <sam dot mesh at gmail dot com>
@@ -2024,10 +2024,82 @@ Paul Friberg <p dot friberg at isti dot com>
 Zachi Klopman <zklopman at gmail dot com>
 Jin Zhi Ye <jinzhiye at kedacom dot com>
 David Carlton <david dot carlton at sun dot com>
-Felix Li <fengli at gmail dot com>
+Feng Li <fengli at gmail dot com>
 Michael van der Westhuizen <r1mikey at gmail dot com>
 Jan Zima <Jan dot Zima at sofis dot cz>
 Francesco Salvestrini <f dot salvestrini at nextworks dot it>
+Sandeep Deshpande <sandeep dot bvb at gmail dot com>
+Hubert Talbot <Hubert dot Talbot at criq dot qc dot ca>
+Oh Yoon Sik <boom at estsoft dot com>
+Anton Bakanovskiy <Anton dot Bakanovskiy at bercut dot ru>
+Toha Bakanovsky <im-scooter at yandex dot ru>
+David Faure <dfaure at klaralvdalens-datakonsult dot se>
+Robert Hancock <hancockr at shaw dot ca>
+Peter Oslej <peter dot oslej at vrm dot sk>
+Yongming Wang <wangym at gmail dot com>
+Vadim Iosevich <viosevich at gmail dot com>
+Mike Knight <mike dot knight at compuware dot com>
+Nathan Anderson <nathan dot l dot anderson at lmco dot com>
+Eyal Car <eyal_car at hotmail dot com>
+Jonathan Sprinkle <sprinkle at eecs dot berkeley dot edu>
+Vladimir Panov <gbr at voidland dot org>
+Volker Lukas <vlukas at gmx dot de>
+Bryan Cassell <BryanCassell dot iti-team dot com>
+Guy Peleg <guy dot peleg at amdocs dot com>
+Wallace Zhang  <zhangw at ociweb dot com>
+Richard Ward <richard_ward at symantec dot com>
+Alan Stokes <alan at alanstokes dot org dot uk>
+Rick Taylor <rick at tropicalstormsoftware dot com>
+Tobias Herzke <tobias dot herzke at uni-oldenburg dot de>
+Paul Felix <pef at fluent dot com>
+Jan Ohlenburg <jan dot ohlenburg at fit dot fraunhofer dot de>.
+Eric Tiangang <tgliu at utstar dot com>
+David Hawkins <dwh at ovro dot caltech dot edu>
+Michael Klein <michael dot klein at fazi dot de>
+Sandro Santos Andrade <sandros at dcc dot ufba dot br>
+Richard Spence <richard dot spence dot extern at icn dot siemens dot de>
+Thomas E Lackey <telackey at bozemanpass dot com>
+luxi78 at gmail dot com
+John Lilley <jlilley at datalever dot com>
+Abdullah Sowayan <abdullah dot sowayan at lmco dot com>
+Nathan Bamford <nbamford at datalever dot com>
+Zoltan Molnar <zolmol at isis dot vanderbilt dot edu>
+William Byrne <williamb at codics dot com>
+Karl Schmitt <Karl dot Schmitt at dfs dot de>
+Ron DeAngelis <rdeangel at rite-solutions dot com>
+Alex Sheh <ASHEH at euphonix dot com>
+Daniel Wagner <__daniel___ at icg do tu-graz dot ac dot at>
+Nemoy Michael <michaeln at sintecmedia dot com>
+Marc Brown <mbrown at fisheyesoftware dot com>
+Andrew Keane <andrew at keaneville dot com>
+Martin Kolleck
+Tino Riethmueller
+Adam Mitz  <mitza at ociweb dot com>
+Frank Rehberger <frehberger at prismtech dot com>
+Aaron Scamehorn <aaron dot scamehorn at cogcap dot com>
+Alan Kierstead <ackierstead at fedex dot com>
+Sven-Uwe Sieler-Hornke <sven-uwe dot sieler-hornke at investment-cybernetics dot de>
+Spencer Vanroekel <Spencer dot Vanroekel at Siemens dot com>
+Dan Pozdol <dpozdol at wolve dot com>
+Yauheni Akhotnikau <eao197 at intervale dot ru>
+Axter <google at axter dot com>
+Roopa Pundaleeka <roopa at txcorp dot com>
+JR Andreassen <janrune at io doc com>
+Mockey Chen <mockey dot chen @ google dot com>
+Vincent Joseph <deskamess at yahoo dot com>
+qwerty <qwerty0987654321 at mail dot ru>
+Yuan <yuanhp_china at hotmail dot com>
+Adrian Tulloch <my-ace-sub at reyes-tulloch dot com>
+Dmitriy Kuznetsov <dk3 at garant dot ru>
+Steve Orner <saorner at rdainc dot com>
+Bob Ronak <ronak2121 at gmail dot com>
+Aleksandar Vukajlovic <vukajlo at finsoft dot co dot yu>
+Ignacio Alvarez <support at xentient dot com>
+Sergey Zubarev <sergant128 at mail dot ru>
+Qingbo Cai <qingbo dot cai at case dot edu>
+David White <david dot white dot 7 at gmail dot com>
+Jason Zhang <zzm9981 at 163 dot com>
+Mark Paulus <mark dot paulus at mci dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
@@ -2054,4 +2126,3 @@ for instructions on submitting suggestions or fixes.
 
                 Douglas C. Schmidt
                 d.schmidt at vanderbilt.edu
-