address@hidden: Bug#259384: libcommoncpp2: FTBFS with gcc-3.4: New patch]

[Mark Purcell]

David (and others),

Find enclosed a patch to build libcommoncpp2 against gcc-3.4.

Mark
http://packages.debian.org/libcommoncpp2

----- Forwarded message from Andreas Jochens <address@hidden> -----

Envelope-to: address@hidden
Delivery-date: Wed, 14 Jul 2004 22:11:11 +1000
Reply-To: Andreas Jochens <address@hidden>, address@hidden
Resent-From: Andreas Jochens <address@hidden>
Resent-To: address@hidden
Resent-CC: Mark Purcell <address@hidden>
Resent-Date: Wed, 14 Jul 2004 12:03:07 UTC
Resent-Message-ID: <address@hidden>
X-Debian-PR-Message: report 259384
X-Debian-PR-Package: libcommoncpp2
X-Debian-PR-Keywords: patch
To: address@hidden
From: Andreas Jochens <address@hidden>
Resent-Sender: Debian BTS <address@hidden>
X-SA-Exim-Connect-IP: 128.193.0.4
X-SA-Exim-Mail-From: address@hidden
Subject: Bug#259384: libcommoncpp2: FTBFS with gcc-3.4: New patch
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on purcell.homeip.net
X-Spam-Status: No, hits=0.0 required=4.0 tests=none autolearn=no version=2.63
X-Spam-Level: 
X-SA-Exim-Version: 4.0 (built Sat, 24 Apr 2004 12:31:30 +0200)
X-SA-Exim-Scanned: Yes (on purcell.homeip.net)

Oops. My last patch was incomplete.
I forgot to remove the extra ';' characters in the template/*.h 
header files. The attached patch also removes those.

Regards
Andreas Jochens

diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/cmdoptns.h 
./include/cc++/cmdoptns.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/cmdoptns.h    2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/cmdoptns.h   2004-07-14 12:24:56.547689472 +0200
@@ -444,7 +444,7 @@
 );
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/digest.h 
./include/cc++/digest.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/digest.h      2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/digest.h     2004-07-14 12:29:09.842755965 +0200
@@ -441,7 +441,7 @@
 };
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/exception.h 
./include/cc++/exception.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/exception.h   2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/exception.h  2004-07-14 11:55:13.601985494 +0200
@@ -101,7 +101,7 @@
 
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/file.h 
./include/cc++/file.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/file.h        2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/file.h       2004-07-14 11:55:36.524560422 +0200
@@ -1084,7 +1084,7 @@
 #endif
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/groups.h 
./include/cc++/groups.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/groups.h      2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/groups.h     2004-07-14 12:30:13.611424094 +0200
@@ -156,7 +156,7 @@
 };
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/misc.h 
./include/cc++/misc.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/misc.h        2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/misc.h       2004-07-14 12:03:52.943719743 +0200
@@ -744,7 +744,7 @@
 };
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/numbers.h 
./include/cc++/numbers.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/numbers.h     2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/numbers.h    2004-07-14 12:24:06.273400322 +0200
@@ -313,7 +313,7 @@
 };
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/persist.h 
./include/cc++/persist.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/persist.h     2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/persist.h    2004-07-14 12:27:53.731464098 +0200
@@ -561,7 +561,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/process.h 
./include/cc++/process.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/process.h     2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/process.h    2004-07-14 12:05:21.614598701 +0200
@@ -135,7 +135,7 @@
 };
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/serial.h 
./include/cc++/serial.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/serial.h      2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/serial.h     2004-07-14 12:02:57.829361239 +0200
@@ -890,7 +890,7 @@
 #endif
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/slog.h 
./include/cc++/slog.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/slog.h        2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/slog.h       2004-07-14 11:59:07.233882291 +0200
@@ -246,7 +246,7 @@
 #endif
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/socket.h 
./include/cc++/socket.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/socket.h      2003-07-19 
19:15:33.000000000 +0200
+++ ./include/cc++/socket.h     2004-07-14 12:00:00.597579719 +0200
@@ -2173,7 +2173,7 @@
 #endif
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/strchar.h 
./include/cc++/strchar.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/strchar.h     2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/strchar.h    2004-07-14 11:54:49.241688065 +0200
@@ -52,7 +52,7 @@
 #ifdef HAVE_STRINGS_H
 extern "C" {
 #include <strings.h>
-};
+}
 #endif
 
 #ifdef HAVE_STRCASECMP
@@ -133,7 +133,7 @@
 };
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/thread.h 
./include/cc++/thread.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/thread.h      2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/thread.h     2004-07-14 11:52:18.689764763 +0200
@@ -1080,7 +1080,7 @@
        static Thread* _main;
 
        Thread *_parent;
-       enum Cancel _cancel;
+       Cancel _cancel;
        Semaphore *_start;
 
        // private data
@@ -1694,15 +1694,15 @@
 
 /** @relates Buffer */
 inline int get(Buffer &b, void *o)
-       {return b.wait(o);};
+       {return b.wait(o);}
 
 /** @relates Buffer */
 inline int put(Buffer &b, void *o)
-       {return b.post(o);};
+       {return b.post(o);}
 
 /** @relates Buffer */
 inline int peek(Buffer &b, void *o)
-       {return b.peek(o);};
+       {return b.peek(o);}
 
 
 // FIXME: not in win32 implementation
@@ -1809,7 +1809,7 @@
 // macosx dynamic loader...
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/unix.h 
./include/cc++/unix.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/unix.h        2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/unix.h       2004-07-14 12:31:10.793366004 +0200
@@ -397,7 +397,7 @@
 #endif // ndef WIN32
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/url.h 
./include/cc++/url.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/url.h 2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/url.h        2004-07-14 12:25:34.879285356 +0200
@@ -350,7 +350,7 @@
 };
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/urlstring.h 
./include/cc++/urlstring.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/urlstring.h   2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/urlstring.h  2004-07-14 12:09:10.104478208 +0200
@@ -159,7 +159,7 @@
                unsigned char *dst, size_t dstsize);
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/xml.h 
./include/cc++/xml.h
--- ../tmp-orig/libcommoncpp2-1.0.13/include/cc++/xml.h 2003-06-07 
01:16:45.000000000 +0200
+++ ./include/cc++/xml.h        2004-07-14 12:26:50.037767560 +0200
@@ -324,7 +324,7 @@
 #endif // ifdef COMMON_XML_PARSING
        
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/buffer.cpp ./src/buffer.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/buffer.cpp     2003-06-07 
01:16:46.000000000 +0200
+++ ./src/buffer.cpp    2004-07-14 12:22:55.460078218 +0200
@@ -146,7 +146,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/cmdoptns.cpp ./src/cmdoptns.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/cmdoptns.cpp   2003-06-07 
01:16:46.000000000 +0200
+++ ./src/cmdoptns.cpp  2004-07-14 12:25:16.569822014 +0200
@@ -663,7 +663,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/date.cpp ./src/date.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/date.cpp       2003-06-07 
01:16:46.000000000 +0200
+++ ./src/date.cpp      2004-07-14 12:29:36.506599590 +0200
@@ -194,7 +194,7 @@
 Date::Date(int year, unsigned month, unsigned day)
 {
        toJulian(year, month, day);
-};
+}
 
 bool Date::isValid(void) const
 {
@@ -916,8 +916,8 @@
 
 DateNumber::DateNumber(char *str) :
 Number(str, 10), Date(str, 10)
-{};
+{}
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/digest.cpp ./src/digest.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/digest.cpp     2003-06-07 
01:16:46.000000000 +0200
+++ ./src/digest.cpp    2004-07-14 12:28:52.471115372 +0200
@@ -203,6 +203,6 @@
 
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif 
        
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/dir.cpp ./src/dir.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/dir.cpp        2003-06-07 
01:16:46.000000000 +0200
+++ ./src/dir.cpp       2004-07-14 11:59:22.324968777 +0200
@@ -145,7 +145,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/dso.cpp ./src/dso.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/dso.cpp        2003-06-07 
01:16:46.000000000 +0200
+++ ./src/dso.cpp       2004-07-14 12:04:48.462999854 +0200
@@ -275,7 +275,7 @@
 #endif
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/engine.cpp ./src/engine.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/engine.cpp     2003-06-07 
01:16:46.000000000 +0200
+++ ./src/engine.cpp    2004-07-14 12:28:28.768696000 +0200
@@ -463,7 +463,7 @@
 #undef CCXX_WE
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/event.cpp ./src/event.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/event.cpp      2003-06-07 
01:16:46.000000000 +0200
+++ ./src/event.cpp     2004-07-14 11:58:37.190682439 +0200
@@ -130,7 +130,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
        
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/exception.cpp ./src/exception.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/exception.cpp  2003-06-07 
01:16:46.000000000 +0200
+++ ./src/exception.cpp 2004-07-14 12:05:01.222536159 +0200
@@ -70,7 +70,7 @@
 { }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif //HAVE_EXCEPTION
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/fifo.cpp ./src/fifo.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/fifo.cpp       2003-06-07 
01:16:46.000000000 +0200
+++ ./src/fifo.cpp      2004-07-14 12:23:27.558878230 +0200
@@ -152,7 +152,7 @@
 #endif // ndef WIN32
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/file.cpp ./src/file.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/file.cpp       2003-06-07 
01:16:46.000000000 +0200
+++ ./src/file.cpp      2004-07-14 11:59:46.893225547 +0200
@@ -1237,7 +1237,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/friends.cpp ./src/friends.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/friends.cpp    2003-06-07 
01:16:46.000000000 +0200
+++ ./src/friends.cpp   2004-07-14 11:58:19.646069574 +0200
@@ -146,7 +146,7 @@
 #endif // !WIN32
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/groups.cpp ./src/groups.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/groups.cpp     2003-06-07 
01:16:46.000000000 +0200
+++ ./src/groups.cpp    2004-07-14 12:29:50.211949187 +0200
@@ -222,7 +222,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/inaddr.cpp ./src/inaddr.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/inaddr.cpp     2003-06-07 
01:16:46.000000000 +0200
+++ ./src/inaddr.cpp    2004-07-14 12:00:57.499593800 +0200
@@ -430,7 +430,7 @@
 { }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/keydata.cpp ./src/keydata.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/keydata.cpp    2003-07-02 
23:21:19.000000000 +0200
+++ ./src/keydata.cpp   2004-07-14 12:04:30.117542093 +0200
@@ -559,7 +559,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/md5.cpp ./src/md5.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/md5.cpp        2003-06-07 
01:16:46.000000000 +0200
+++ ./src/md5.cpp       2004-07-14 12:30:34.781330166 +0200
@@ -336,6 +336,6 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif 
        
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/mempager.cpp ./src/mempager.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/mempager.cpp   2003-06-07 
01:16:46.000000000 +0200
+++ ./src/mempager.cpp  2004-07-14 12:03:40.279165038 +0200
@@ -160,7 +160,7 @@
 
 SharedMemPager::SharedMemPager(int pg) :
 MemPager(pg), Mutex()
-{};
+{}
 
 void SharedMemPager::purge(void)
 {
@@ -190,7 +190,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};     
+}      
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/mutex.cpp ./src/mutex.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/mutex.cpp      2003-06-07 
01:16:46.000000000 +0200
+++ ./src/mutex.cpp     2004-07-14 11:57:11.029316393 +0200
@@ -286,13 +286,13 @@
 MutexCounter::MutexCounter() : Mutex()
 {
        counter = 0;
-};
+}
 #endif
 
 MutexCounter::MutexCounter(int initial) : Mutex()
 {
        counter = initial;
-};
+}
 
 int operator++(MutexCounter &mc)
 {
@@ -513,7 +513,7 @@
 #endif // !WIN32
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/numbers.cpp ./src/numbers.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/numbers.cpp    2003-06-07 
01:16:46.000000000 +0200
+++ ./src/numbers.cpp   2004-07-14 12:24:27.799242463 +0200
@@ -247,5 +247,5 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/peer.cpp ./src/peer.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/peer.cpp       2003-06-07 
01:16:46.000000000 +0200
+++ ./src/peer.cpp      2004-07-14 12:01:19.066429883 +0200
@@ -171,7 +171,7 @@
 
 UDPDuplex::UDPDuplex(const InetAddress &bind, tpport_t port) :
 UDPTransmit(bind, port + 1), UDPReceive(bind, port)
-{};
+{}
 
 Socket::Error UDPDuplex::connect(const InetHostAddress &host, tpport_t port)
 {
@@ -194,5 +194,5 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/persist.cpp ./src/persist.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/persist.cpp    2003-06-07 
01:16:46.000000000 +0200
+++ ./src/persist.cpp   2004-07-14 12:27:37.391620424 +0200
@@ -137,7 +137,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/pipe.cpp ./src/pipe.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/pipe.cpp       2003-06-07 
01:16:46.000000000 +0200
+++ ./src/pipe.cpp      2004-07-14 12:23:46.684184089 +0200
@@ -186,7 +186,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/port.cpp ./src/port.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/port.cpp       2003-06-07 
01:16:46.000000000 +0200
+++ ./src/port.cpp      2004-07-14 12:02:06.738225741 +0200
@@ -870,7 +870,7 @@
 }                                              
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif         
        
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/process.cpp ./src/process.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/process.cpp    2003-06-07 
01:16:46.000000000 +0200
+++ ./src/process.cpp   2004-07-14 12:05:39.974053691 +0200
@@ -217,7 +217,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/semaphore.cpp ./src/semaphore.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/semaphore.cpp  2003-06-07 
01:16:46.000000000 +0200
+++ ./src/semaphore.cpp 2004-07-14 11:57:41.523429394 +0200
@@ -233,7 +233,7 @@
 #endif //WIN32
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/serial.cpp ./src/serial.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/serial.cpp     2003-06-07 
01:16:46.000000000 +0200
+++ ./src/serial.cpp    2004-07-14 12:03:18.179432066 +0200
@@ -1735,7 +1735,7 @@
 #endif
                
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/sha.cpp ./src/sha.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/sha.cpp        2003-06-07 
01:16:46.000000000 +0200
+++ ./src/sha.cpp       2004-07-14 12:30:50.691253437 +0200
@@ -693,7 +693,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif 
 /** EMACS **
  * Local variables:
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/slog.cpp ./src/slog.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/slog.cpp       2003-06-07 
01:16:46.000000000 +0200
+++ ./src/slog.cpp      2004-07-14 11:58:49.133376787 +0200
@@ -333,7 +333,7 @@
 }      
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/socket.cpp ./src/socket.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/socket.cpp     2003-06-07 
01:16:46.000000000 +0200
+++ ./src/socket.cpp    2004-07-14 12:02:31.932361367 +0200
@@ -1604,7 +1604,7 @@
 #endif
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/thread.cpp ./src/thread.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/thread.cpp     2003-06-07 
01:16:46.000000000 +0200
+++ ./src/thread.cpp    2004-07-14 11:56:37.349818258 +0200
@@ -583,7 +583,7 @@
        _cancel = cancelInitial;
 
 #endif // WIN32
-};
+}
 
 #ifndef WIN32
 Thread::Thread(const Thread &th)
@@ -1410,7 +1410,7 @@
 {
        nufds = 0;
        ufds = NULL;
-};
+}
 
 Poller::~Poller()
 {
@@ -1436,7 +1436,7 @@
 // this function must declared as extern "C" for some compiler
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
  
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/threadkey.cpp ./src/threadkey.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/threadkey.cpp  2003-06-07 
01:16:46.000000000 +0200
+++ ./src/threadkey.cpp 2004-07-14 11:58:08.000317873 +0200
@@ -97,7 +97,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/unix.cpp ./src/unix.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/unix.cpp       2003-06-07 
01:16:46.000000000 +0200
+++ ./src/unix.cpp      2004-07-14 12:06:13.127652036 +0200
@@ -532,5 +532,5 @@
 
 #endif // ndef WIN32 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/url.cpp ./src/url.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/url.cpp        2003-06-07 
01:16:46.000000000 +0200
+++ ./src/url.cpp       2004-07-14 12:25:53.145756985 +0200
@@ -723,10 +723,10 @@
        if(!str)
                return;
        referer = str;
-};
+}
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 /** EMACS **
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/urlstring.cpp ./src/urlstring.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/urlstring.cpp  2003-06-07 
01:16:46.000000000 +0200
+++ ./src/urlstring.cpp 2004-07-14 12:22:29.749044350 +0200
@@ -323,5 +323,5 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/src/xml.cpp ./src/xml.cpp
--- ../tmp-orig/libcommoncpp2-1.0.13/src/xml.cpp        2003-06-07 
01:16:46.000000000 +0200
+++ ./src/xml.cpp       2004-07-14 12:26:19.221720096 +0200
@@ -132,7 +132,7 @@
        xml->endElement(name);
 }
 
-};
+}
 
 bool XMLStream::parse(const char *resource)
 {
@@ -462,7 +462,7 @@
 }
 
 #ifdef CCXX_NAMESPACES
-};
+}
 #endif
 
 #endif // ifdef HAVE_LIBXML
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/template/counter.h 
./template/counter.h
--- ../tmp-orig/libcommoncpp2-1.0.13/template/counter.h 2003-06-07 
01:16:51.000000000 +0200
+++ ./template/counter.h        2004-07-14 13:18:33.181340871 +0200
@@ -63,4 +63,4 @@
                {return count++;}
 };
 
-};
+}
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/template/functions.h 
./template/functions.h
--- ../tmp-orig/libcommoncpp2-1.0.13/template/functions.h       2003-06-07 
01:16:51.000000000 +0200
+++ ./template/functions.h      2004-07-14 13:18:43.352370535 +0200
@@ -51,6 +51,6 @@
        return v;
 }      
 
-};
+}
 
 #endif
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/template/objcount.h 
./template/objcount.h
--- ../tmp-orig/libcommoncpp2-1.0.13/template/objcount.h        2003-06-07 
01:16:51.000000000 +0200
+++ ./template/objcount.h       2004-07-14 13:18:54.553200715 +0200
@@ -53,4 +53,4 @@
 template <class T>
 unsigned objCounter<T>::objCount = 0;
 
-};
+}
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/template/objlink.h 
./template/objlink.h
--- ../tmp-orig/libcommoncpp2-1.0.13/template/objlink.h 2003-06-07 
01:16:51.000000000 +0200
+++ ./template/objlink.h        2004-07-14 13:19:00.553038434 +0200
@@ -75,4 +75,4 @@
        return obj;
 }       
 
-};
+}
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/template/objmap.h ./template/objmap.h
--- ../tmp-orig/libcommoncpp2-1.0.13/template/objmap.h  2003-06-07 
01:16:51.000000000 +0200
+++ ./template/objmap.h 2004-07-14 13:19:09.802246694 +0200
@@ -112,4 +112,4 @@
        return obj;
 }       
 
-};
+}
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/template/objsync.h 
./template/objsync.h
--- ../tmp-orig/libcommoncpp2-1.0.13/template/objsync.h 2003-06-07 
01:16:51.000000000 +0200
+++ ./template/objsync.h        2004-07-14 13:19:18.559550251 +0200
@@ -59,4 +59,4 @@
 template <class T>
 ost::Mutex objSync<T>::objMutex;
 
-};
+}
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/template/oststring.h 
./template/oststring.h
--- ../tmp-orig/libcommoncpp2-1.0.13/template/oststring.h       2003-06-07 
01:16:51.000000000 +0200
+++ ./template/oststring.h      2004-07-14 13:19:39.827430319 +0200
@@ -62,5 +62,5 @@
 typedef        std::basic_string<char> cstring;
 typedef std::basic_string<char, cistring_char_traits<char> > cistring;
 
-};
+}
 
diff -urN ../tmp-orig/libcommoncpp2-1.0.13/template/pointer.h 
./template/pointer.h
--- ../tmp-orig/libcommoncpp2-1.0.13/template/pointer.h 2003-06-07 
01:16:51.000000000 +0200
+++ ./template/pointer.h        2004-07-14 13:13:02.172469008 +0200
@@ -116,4 +116,4 @@
        }
 };     
 
-};
+}


----- End forwarded message -----