summaryrefslogtreecommitdiff
blob: 49e4b7828975df371315dd99658778a8b5a6db8c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
--- a/commoncpp/exception.cpp
+++ b/commoncpp/exception.cpp
@@ -53,14 +53,14 @@
 
 namespace ost {
 
-Exception::Exception(const String& what_arg) throw():
+Exception::Exception(const String& what_arg) :
 _what(what_arg)
 {}
 
-Exception::~Exception() throw()
+Exception::~Exception()
 {}
 
-const char *Exception::what() const throw()
+const char *Exception::what() const noexcept
 {
     return _what.c_str();
 }
@@ -70,22 +70,22 @@
     return _what.c_str();
 }
 
-IOException::IOException(const String &what_arg, long systemError) throw() :
+IOException::IOException(const String &what_arg, long systemError) :
     Exception(what_arg), _systemError(systemError),
     _systemErrorString(NULL) {
 }
 
-IOException::~IOException() throw()
+IOException::~IOException()
 {
     delete [] _systemErrorString;
 }
 
-long IOException::getSystemError() const throw()
+long IOException::getSystemError() const
 {
     return _systemError;
 }
 
-const char* IOException::getSystemErrorString() const throw()
+const char* IOException::getSystemErrorString() const
 {
     const uint32_t errStrSize = 2048;
     if ( !_systemErrorString )
--- a/commoncpp/persist.cpp
+++ b/commoncpp/persist.cpp
@@ -39,7 +39,7 @@
     return _what;
 }
 
-PersistException::~PersistException() throw()
+PersistException::~PersistException()
 {
 }
 
@@ -114,7 +114,7 @@
     TypeManager::remove(myName.c_str());
 }
 
-PersistEngine::PersistEngine(std::iostream& stream, EngineMode mode) throw(PersistException) :
+PersistEngine::PersistEngine(std::iostream& stream, EngineMode mode) :
 myUnderlyingStream(stream), myOperationalMode(mode)
 {
 }
@@ -125,7 +125,7 @@
         myUnderlyingStream.sync();
 }
 
-void PersistEngine::writeBinary(const uint8_t* data, const uint32_t size) throw(PersistException)
+void PersistEngine::writeBinary(const uint8_t* data, const uint32_t size)
 {
   if(myOperationalMode != modeWrite)
     throw("Cannot write to an input Engine");
@@ -133,14 +133,14 @@
 }
 
 
-void PersistEngine::readBinary(uint8_t* data, uint32_t size) throw(PersistException)
+void PersistEngine::readBinary(uint8_t* data, uint32_t size)
 {
   if(myOperationalMode != modeRead)
     throw("Cannot read from an output Engine");
   myUnderlyingStream.read((char *)data,size);
 }
 
-void PersistEngine::write(const PersistObject *object) throw(PersistException)
+void PersistEngine::write(const PersistObject *object)
 {
   // Pre-step, if object is NULL, then don't serialize it - serialize a
   // marker to say that it is null.
@@ -181,7 +181,7 @@
   }
 }
 
-void PersistEngine::read(PersistObject &object) throw(PersistException)
+void PersistEngine::read(PersistObject &object)
 {
   uint32_t id = 0;
   read(id);
@@ -202,7 +202,7 @@
   readObject(&object);
 }
 
-void PersistEngine::read(PersistObject *&object) throw(PersistException)
+void PersistEngine::read(PersistObject *&object)
 {
   uint32_t id = 0;
   read(id);
@@ -237,7 +237,7 @@
     throw(PersistException(std::string("Unable to instantiate object of class ")+className));
 }
 
-void PersistEngine::readObject(PersistObject* object) throw(PersistException)
+void PersistEngine::readObject(PersistObject* object)
 {
   // Okay then - we can make this object
   myArchiveVector.push_back(object);
@@ -251,7 +251,7 @@
     throw( PersistException("Missing End-of-Object marker"));
 }
 
-const std::string PersistEngine::readClass() throw(PersistException)
+const std::string PersistEngine::readClass()
 {
   // Okay - read the identifier for the class in...
   uint32_t classId = 0;
@@ -269,14 +269,14 @@
   return className;
 }
 
-void PersistEngine::write(const std::string& str) throw(PersistException)
+void PersistEngine::write(const std::string& str)
 {
   uint32_t len = (uint32_t)str.length();
   write(len);
   writeBinary((uint8_t*)str.c_str(),len);
 }
 
-void PersistEngine::read(std::string& str) throw(PersistException)
+void PersistEngine::read(std::string& str)
 {
   uint32_t len = 0;
   read(len);
--- a/commoncpp/tokenizer.cpp
+++ b/commoncpp/tokenizer.cpp
@@ -70,7 +70,7 @@
 }
 
 
-StringTokenizer::iterator& StringTokenizer::iterator::operator ++ () THROWS (StringTokenizer::NoSuchElementException)
+StringTokenizer::iterator& StringTokenizer::iterator::operator ++ ()
 {
 
     // someone requested to read beyond the end .. tsts
@@ -106,7 +106,7 @@
  * if no one requests the token, no time is spent skipping the whitespaces
  * or allocating memory.
  */
-const char * StringTokenizer::iterator::operator * () THROWS (StringTokenizer::NoSuchElementException)
+const char * StringTokenizer::iterator::operator * ()
 {
     // someone requested to read beyond the end .. tsts
     if (endp == myTok->itEnd.endp)
--- a/inc/commoncpp/exception.h
+++ b/inc/commoncpp/exception.h
@@ -77,10 +77,10 @@
     String _what;
 
 public:
-    Exception(const String& what_arg) throw();
-    virtual ~Exception() throw();
+    Exception(const String& what_arg);
+    virtual ~Exception();
     virtual const char *getString() const;
-    virtual const char *what() const throw();
+    virtual const char *what() const noexcept;
 };
 
 /**
@@ -96,11 +96,11 @@
     mutable char* _systemErrorString;
 
 public:
-    IOException(const String &what_arg, long systemError = 0) throw();
-    virtual ~IOException() throw();
+    IOException(const String &what_arg, long systemError = 0);
+    virtual ~IOException();
 
-    virtual long getSystemError() const throw();
-    virtual const char* getSystemErrorString() const throw();
+    virtual long getSystemError() const;
+    virtual const char* getSystemErrorString() const;
 };
 
 /**
--- a/inc/commoncpp/persist.h
+++ b/inc/commoncpp/persist.h
@@ -46,7 +46,7 @@
     PersistException(const std::string& reason);
     const std::string& getString() const;
 
-    virtual ~PersistException() throw();
+    virtual ~PersistException();
 
 protected:
     std::string _what;
@@ -210,7 +210,7 @@
      * the given mode. The stream must be initialized properly prior
      * to this call or problems will ensue.
      */
-    PersistEngine(std::iostream& stream, EngineMode mode) throw(PersistException);
+    PersistEngine(std::iostream& stream, EngineMode mode);
 
     virtual ~PersistEngine();
 
@@ -219,75 +219,75 @@
     /**
      * writes a PersistObject from a reference.
      */
-    inline void write(const PersistObject &object) throw(PersistException)
+    inline void write(const PersistObject &object)
         {write(&object);}
 
     /**
      * writes a PersistObject from a pointer.
      */
-    void write(const PersistObject *object) throw(PersistException);
+    void write(const PersistObject *object);
 
     // writes supported primitive types
   // shortcut, to make the following more readable
 #define CCXX_ENGINEWRITE_REF(valref) writeBinary((const uint8_t*)&valref,sizeof(valref))
-    inline void write(int8_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
-    inline void write(uint8_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
-    inline void write(int16_t i)  throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
-    inline void write(uint16_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
-    inline void write(int32_t i)  throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
-    inline void write(uint32_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
-    inline void write(float i)  throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
-    inline void write(double i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
-    inline void write(bool i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+    inline void write(int8_t i) { CCXX_ENGINEWRITE_REF(i); }
+    inline void write(uint8_t i) { CCXX_ENGINEWRITE_REF(i); }
+    inline void write(int16_t i) { CCXX_ENGINEWRITE_REF(i); }
+    inline void write(uint16_t i) { CCXX_ENGINEWRITE_REF(i); }
+    inline void write(int32_t i) { CCXX_ENGINEWRITE_REF(i); }
+    inline void write(uint32_t i) { CCXX_ENGINEWRITE_REF(i); }
+    inline void write(float i) { CCXX_ENGINEWRITE_REF(i); }
+    inline void write(double i) { CCXX_ENGINEWRITE_REF(i); }
+    inline void write(bool i) { CCXX_ENGINEWRITE_REF(i); }
 #undef CCXX_ENGINEWRITE_REF
 
-    void write(const std::string& str) throw(PersistException);
+    void write(const std::string& str);
 
     // Every write operation boils down to one or more of these
-    void writeBinary(const uint8_t* data, const uint32_t size) throw(PersistException);
+    void writeBinary(const uint8_t* data, const uint32_t size);
 
     // Read Operations
 
     /**
      * reads a PersistObject into a reference overwriting the object.
      */
-    void read(PersistObject &object) throw(PersistException);
+    void read(PersistObject &object);
 
     /**
      * reads a PersistObject into a pointer allocating memory for the object if necessary.
      */
-    void read(PersistObject *&object) throw(PersistException);
+    void read(PersistObject *&object);
 
     // reads supported primitive types
   // shortcut, to make the following more readable
 #define CCXX_ENGINEREAD_REF(valref) readBinary((uint8_t*)&valref,sizeof(valref))
-    inline void read(int8_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
-    inline void read(uint8_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
-    inline void read(int16_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
-    inline void read(uint16_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
-    inline void read(int32_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
-    inline void read(uint32_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
-    inline void read(float& i)  throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
-    inline void read(double& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
-    inline void read(bool &i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+    inline void read(int8_t& i) { CCXX_ENGINEREAD_REF(i); }
+    inline void read(uint8_t& i) { CCXX_ENGINEREAD_REF(i); }
+    inline void read(int16_t& i) { CCXX_ENGINEREAD_REF(i); }
+    inline void read(uint16_t& i) { CCXX_ENGINEREAD_REF(i); }
+    inline void read(int32_t& i) { CCXX_ENGINEREAD_REF(i); }
+    inline void read(uint32_t& i) { CCXX_ENGINEREAD_REF(i); }
+    inline void read(float& i) { CCXX_ENGINEREAD_REF(i); }
+    inline void read(double& i) { CCXX_ENGINEREAD_REF(i); }
+    inline void read(bool &i) { CCXX_ENGINEREAD_REF(i); }
 #undef CCXX_ENGINEREAD_REF
 
-    void read(std::string& str) throw(PersistException);
+    void read(std::string& str);
 
     // Every read operation boiled down to one or more of these
-    void readBinary(uint8_t* data, uint32_t size) throw(PersistException);
+    void readBinary(uint8_t* data, uint32_t size);
 
 private:
     /**
      * reads the actual object data into a pre-instantiated object pointer
      * by calling the read function of the derived class.
      */
-    void readObject(PersistObject* object) throw(PersistException);
+    void readObject(PersistObject* object);
 
     /**
      * reads in a class name, and caches it into the ClassMap.
      */
-    const std::string readClass() throw(PersistException);
+    const std::string readClass();
 
 
     /**
@@ -319,63 +319,63 @@
 
 // Standard >> and << stream operators for PersistObject
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, PersistObject &ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, PersistObject &ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, PersistObject *&ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, PersistObject *&ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const &ob) throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const &ob) {CCXX_WE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const *ob) throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const *ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, int8_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, int8_t& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, int8_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, int8_t ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, uint8_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, uint8_t& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, uint8_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, uint8_t ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, int16_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, int16_t& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, int16_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, int16_t ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, uint16_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, uint16_t& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, uint16_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, uint16_t ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, int32_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, int32_t& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, int32_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, int32_t ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, uint32_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, uint32_t& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, uint32_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, uint32_t ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, float& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, float& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, float ob)  throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, float ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, double& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, double& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, double ob) throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, double ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, std::string& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, std::string& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, std::string ob) throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, std::string ob) {CCXX_WE(ar,ob);}
 
 /** @relates PersistEngine */
-inline PersistEngine& operator >>( PersistEngine& ar, bool& ob) throw(PersistException) {CCXX_RE(ar,ob);}
+inline PersistEngine& operator >>( PersistEngine& ar, bool& ob) {CCXX_RE(ar,ob);}
 /** @relates PersistEngine */
-inline PersistEngine& operator <<( PersistEngine& ar, bool ob)  throw(PersistException) {CCXX_WE(ar,ob);}
+inline PersistEngine& operator <<( PersistEngine& ar, bool ob) {CCXX_WE(ar,ob);}
 
 #undef CCXX_RE
 #undef CCXX_WE
@@ -390,7 +390,7 @@
  * the engine
  */
 template<class T>
-PersistEngine& operator <<( PersistEngine& ar, typename std::vector<T> const& ob) throw(PersistException)
+PersistEngine& operator <<( PersistEngine& ar, typename std::vector<T> const& ob)
 {
     ar << (uint32_t)ob.size();
     for(unsigned int i=0; i < ob.size(); ++i)
@@ -404,7 +404,7 @@
  * an engine.
  */
 template<class T>
-PersistEngine& operator >>( PersistEngine& ar, typename std::vector<T>& ob) throw(PersistException)
+PersistEngine& operator >>( PersistEngine& ar, typename std::vector<T>& ob)
 {
     ob.clear();
     uint32_t siz;
@@ -421,7 +421,7 @@
  * the engine
  */
 template<class T>
-PersistEngine& operator <<( PersistEngine& ar, typename std::deque<T> const& ob) throw(PersistException)
+PersistEngine& operator <<( PersistEngine& ar, typename std::deque<T> const& ob)
 {
     ar << (uint32_t)ob.size();
   for(typename std::deque<T>::const_iterator it=ob.begin(); it != ob.end(); ++it)
@@ -435,7 +435,7 @@
  * an engine.
  */
 template<class T>
-PersistEngine& operator >>( PersistEngine& ar, typename std::deque<T>& ob) throw(PersistException)
+PersistEngine& operator >>( PersistEngine& ar, typename std::deque<T>& ob)
 {
     ob.clear();
     uint32_t siz;
@@ -456,7 +456,7 @@
  * to an engine.
  */
 template<class Key, class Value>
-PersistEngine& operator <<( PersistEngine& ar, typename std::map<Key,Value> const & ob) throw(PersistException)
+PersistEngine& operator <<( PersistEngine& ar, typename std::map<Key,Value> const & ob)
 {
     ar << (uint32_t)ob.size();
     for(typename std::map<Key,Value>::const_iterator it = ob.begin();it != ob.end();++it)
@@ -470,7 +470,7 @@
  * from an engine.
  */
 template<class Key, class Value>
-PersistEngine& operator >>( PersistEngine& ar, typename std::map<Key,Value>& ob) throw(PersistException)
+PersistEngine& operator >>( PersistEngine& ar, typename std::map<Key,Value>& ob)
 {
     ob.clear();
     uint32_t siz;
@@ -488,7 +488,7 @@
  * serialize a pair of some serializable content to the engine.
  */
 template<class x, class y>
-PersistEngine& operator <<( PersistEngine& ar, std::pair<x,y> &ob) throw(PersistException)
+PersistEngine& operator <<( PersistEngine& ar, std::pair<x,y> &ob)
 {
     ar << ob.first << ob.second;
     return ar;
@@ -499,7 +499,7 @@
  * deserialize a pair of some serializable content to the engine.
  */
 template<class x, class y>
-PersistEngine& operator >>(PersistEngine& ar, std::pair<x, y> &ob) throw(PersistException)
+PersistEngine& operator >>(PersistEngine& ar, std::pair<x, y> &ob)
 {
     ar >> ob.first >> ob.second;
     return ar;
--- a/inc/commoncpp/tokenizer.h
+++ b/inc/commoncpp/tokenizer.h
@@ -175,7 +175,7 @@
         /**
          * shifts this iterator to the next token in the string.
          */
-        iterator &operator++() THROWS (NoSuchElementException);
+        iterator &operator++();
 
         /**
          * returns the immutable string this iterator
@@ -185,7 +185,7 @@
          * invalidated for each iteration. If you need the token,
          * copy it (e.g. with strdup());
          */
-        const char*  operator*() THROWS (NoSuchElementException);
+        const char*  operator*();
 
         /**
          * returns the next delimiter after the current token or