Changeset 18825
- Timestamp:
- 05/12/06 09:11:18 (3 years ago)
- Files:
-
- juggler/trunk/modules/vapor/ChangeLog (modified) (1 diff)
- juggler/trunk/modules/vapor/VERSION (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/IO/BlockIO.cpp (modified) (3 diffs)
- juggler/trunk/modules/vapor/vpr/IO/BlockIO.h (modified) (6 diffs)
- juggler/trunk/modules/vapor/vpr/IO/BufferObjectReader.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/IO/BufferObjectReader.h (modified) (24 diffs)
- juggler/trunk/modules/vapor/vpr/IO/BufferObjectWriter.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/IO/BufferObjectWriter.h (modified) (15 diffs)
- juggler/trunk/modules/vapor/vpr/IO/FileHandle_t.h (modified) (8 diffs)
- juggler/trunk/modules/vapor/vpr/IO/ObjectReader.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/IO/ObjectReader.h (modified) (14 diffs)
- juggler/trunk/modules/vapor/vpr/IO/ObjectWriter.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/IO/ObjectWriter.h (modified) (13 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Port/SerialPort_t.h (modified) (52 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Selector_t.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/IO/SerializableObject.h (modified) (6 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketAcceptor.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketBasicOpt.h (modified) (10 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketConnector.cpp (modified) (4 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketConnector.h (modified) (3 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketDatagramOpt.h (modified) (9 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketDatagram_t.h (modified) (9 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketIpOpt.h (modified) (4 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketOptions.h (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketStream_t.h (modified) (4 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/Socket_t.h (modified) (19 diffs)
- juggler/trunk/modules/vapor/vpr/IO/XMLObjectReader.cpp (modified) (14 diffs)
- juggler/trunk/modules/vapor/vpr/IO/XMLObjectReader.h (modified) (12 diffs)
- juggler/trunk/modules/vapor/vpr/IO/XMLObjectWriter.cpp (modified) (8 diffs)
- juggler/trunk/modules/vapor/vpr/IO/XMLObjectWriter.h (modified) (8 diffs)
- juggler/trunk/modules/vapor/vpr/Util/GUID.cpp (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/Util/GUID.h (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/DynLoad/LibraryNSPR.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/NSPR/DynLoad/LibraryNSPR.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/SelectorImplNSPR.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/SelectorImplNSPR.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/InetAddrNSPR.cpp (modified) (6 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/InetAddrNSPR.h (modified) (6 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketDatagramImplNSPR.cpp (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketDatagramImplNSPR.h (modified) (3 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketImplNSPR.cpp (modified) (10 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketImplNSPR.h (modified) (13 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketStreamImplNSPR.cpp (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketStreamImplNSPR.h (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/Thread/ThreadNSPR.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/NSPR/Thread/ThreadNSPR.h (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/DynLoad/LibraryUNIX.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/POSIX/DynLoad/LibraryUNIX.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/FileHandleImplUNIX.cpp (modified) (11 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/FileHandleImplUNIX.h (modified) (10 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Port/SerialPortImplTermios.cpp (modified) (60 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Port/SerialPortImplTermios.h (modified) (63 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/SelectorImplBSD.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/SelectorImplBSD.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/InetAddrBSD.cpp (modified) (7 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/InetAddrBSD.h (modified) (6 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketDatagramImplBSD.cpp (modified) (4 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketDatagramImplBSD.h (modified) (3 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketImplBSD.cpp (modified) (13 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketImplBSD.h (modified) (13 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketStreamImplBSD.cpp (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketStreamImplBSD.h (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/md/POSIX/Thread/ThreadPosix.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/SPROC/Thread/ThreadSGI.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/SPROC/Thread/ThreadSGI.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/WIN32/IO/Port/SerialPortImplWin32.cpp (modified) (43 diffs)
- juggler/trunk/modules/vapor/vpr/md/WIN32/IO/Port/SerialPortImplWin32.h (modified) (52 diffs)
- juggler/trunk/release/vrjuggler-docs.spec (modified) (1 diff)
- juggler/trunk/release/vrjuggler.spec (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/trunk/modules/vapor/ChangeLog
r18810 r18825 1 1 DATE AUTHOR CHANGE 2 2 ---------- -------- ----------------------------------------------------------- 3 2006-05-12 allenb Removed exception specifications from everything but 4 the exception classes. 5 NEW VERSION: 1.1.20 3 6 2006-05-09 allenb Change thread exception handling to output .what() 4 7 for all exceptions based on std::exception. juggler/trunk/modules/vapor/VERSION
r18810 r18825 1 1.1.20-0 @05/12/2006 14:21:00 UTC@ 1 2 1.1.19-1 @05/09/2006 20:21:00 UTC@ 2 3 1.1.19-0 @05/04/2006 20:41:32 UTC@ juggler/trunk/modules/vapor/vpr/IO/BlockIO.cpp
r18824 r18825 128 128 vpr::Uint32& bytesRead, 129 129 const vpr::Interval timeout) 130 throw (IOException)131 130 { 132 131 if(mStatsStrategy != NULL) … … 143 142 vpr::Uint32& bytesRead, 144 143 const vpr::Interval timeout) 145 throw (IOException)146 144 { 147 145 if(mStatsStrategy != NULL) … … 159 157 vpr::Uint32& bytesWritten, 160 158 const vpr::Interval timeout) 161 throw (IOException)162 159 { 163 160 if(mStatsStrategy != NULL) juggler/trunk/modules/vapor/vpr/IO/BlockIO.h
r18824 r18825 181 181 vpr::Uint32& bytesRead, 182 182 const vpr::Interval timeout = vpr::Interval::NoTimeout) 183 throw (IOException)184 183 { 185 184 this->read_s(buffer, length, bytesRead, timeout); … … 213 212 vpr::Uint32& bytesRead, 214 213 const vpr::Interval timeout = vpr::Interval::NoTimeout) 215 throw (IOException)216 214 { 217 215 // Allocate the temporary buffer, zero it, and read in the current … … 250 248 const vpr::Uint32 length, vpr::Uint32& bytesRead, 251 249 const vpr::Interval timeout = vpr::Interval::NoTimeout) 252 throw (IOException)253 250 { 254 251 buffer.resize(length); … … 257 254 // buffer from the device. 258 255 memset(&buffer[0], '\0', buffer.size()); 259 256 260 257 this->read(&buffer[0], buffer.size(), bytesRead, timeout); 261 258 … … 358 355 // Allocate the temporary buffer, zero it, and read in the current 359 356 // buffer from the device. 360 357 361 358 buffer.resize(length); 362 359 memset(&buffer[0], '\0', buffer.size()); 363 360 this->readn(&buffer[0], buffer.size(), bytesRead, timeout); 364 361 365 362 buffer.resize(bytesRead); 366 363 } … … 554 551 /** 555 552 * Read strategy. 553 * @throws vpr::IOException if the read operation failed. 556 554 */ 557 555 virtual void read_s(void* buffer, const vpr::Uint32 length, 558 556 vpr::Uint32& bytesRead, 559 const vpr::Interval timeout = vpr::Interval::NoTimeout) 560 throw (IOException); 557 const vpr::Interval timeout = vpr::Interval::NoTimeout); 561 558 562 559 /** 563 560 * Read strategy. 561 * @throws vpr::IOException if the read operation failed. 564 562 */ 565 563 virtual void readn_s(void* buffer, const vpr::Uint32 length, 566 564 vpr::Uint32& bytesRead, 567 const vpr::Interval timeout = vpr::Interval::NoTimeout) 568 throw (IOException); 565 const vpr::Interval timeout = vpr::Interval::NoTimeout); 569 566 570 567 /** 571 568 * Write strategy. 569 * @throws vpr::IOException if the operation failed. 572 570 */ 573 571 virtual void write_s(const void* buffer, 574 572 const vpr::Uint32 length, 575 573 vpr::Uint32& bytesWritten, 576 const vpr::Interval timeout = vpr::Interval::NoTimeout) 577 throw (IOException); 574 const vpr::Interval timeout = vpr::Interval::NoTimeout); 578 575 579 576 /** juggler/trunk/modules/vapor/vpr/IO/BufferObjectReader.cpp
r18824 r18825 52 52 } 53 53 54 BufferObjectReader::~BufferObjectReader() throw ()54 BufferObjectReader::~BufferObjectReader() 55 55 { 56 56 /* Do nothing. */ ; juggler/trunk/modules/vapor/vpr/IO/BufferObjectReader.h
r18824 r18825 71 71 const unsigned int curPos = 0); 72 72 73 virtual ~BufferObjectReader() throw (); 73 /** Destructor. 74 * @throws nothing 75 */ 76 virtual ~BufferObjectReader(); 74 77 75 78 void setCurPos(const unsigned int val) … … 118 121 * the underlying data source. 119 122 */ 120 virtual void beginTag(const std::string& tagName) throw (IOException)123 virtual void beginTag(const std::string& tagName) 121 124 { 122 125 boost::ignore_unused_variable_warning(tagName); … … 130 133 * the underlying data source. 131 134 */ 132 virtual void endTag() throw (IOException)135 virtual void endTag() 133 136 {;} 134 137 … … 141 144 */ 142 145 virtual void beginAttribute(const std::string& attributeName) 143 throw (IOException)144 146 { 145 147 boost::ignore_unused_variable_warning(attributeName); … … 153 155 * the underlying data source. 154 156 */ 155 virtual void endAttribute() throw (IOException)157 virtual void endAttribute() 156 158 {;} 157 159 //@} … … 165 167 * the underlying data source. 166 168 */ 167 inline virtual vpr::Uint8 readUint8() throw (IOException);168 169 /** 170 * @throw EOFException If end of file is reached while reading. 171 * @throw IOException If some other I/O error occurs while reading from 172 * the underlying data source. 173 */ 174 inline virtual vpr::Uint16 readUint16() throw (IOException);175 176 /** 177 * @throw EOFException If end of file is reached while reading. 178 * @throw IOException If some other I/O error occurs while reading from 179 * the underlying data source. 180 */ 181 inline virtual vpr::Uint32 readUint32() throw (IOException);182 183 /** 184 * @throw EOFException If end of file is reached while reading. 185 * @throw IOException If some other I/O error occurs while reading from 186 * the underlying data source. 187 */ 188 inline virtual vpr::Uint64 readUint64() throw (IOException);189 190 /** 191 * @throw EOFException If end of file is reached while reading. 192 * @throw IOException If some other I/O error occurs while reading from 193 * the underlying data source. 194 */ 195 inline virtual float readFloat() throw (IOException);196 197 /** 198 * @throw EOFException If end of file is reached while reading. 199 * @throw IOException If some other I/O error occurs while reading from 200 * the underlying data source. 201 */ 202 inline virtual double readDouble() throw (IOException);203 204 /** 205 * @throw EOFException If end of file is reached while reading. 206 * @throw IOException If some other I/O error occurs while reading from 207 * the underlying data source. 208 */ 209 inline virtual std::string readString() throw (IOException);210 211 /** 212 * @throw EOFException If end of file is reached while reading. 213 * @throw IOException If some other I/O error occurs while reading from 214 * the underlying data source. 215 */ 216 inline virtual bool readBool() throw (IOException);169 inline virtual vpr::Uint8 readUint8(); 170 171 /** 172 * @throw EOFException If end of file is reached while reading. 173 * @throw IOException If some other I/O error occurs while reading from 174 * the underlying data source. 175 */ 176 inline virtual vpr::Uint16 readUint16(); 177 178 /** 179 * @throw EOFException If end of file is reached while reading. 180 * @throw IOException If some other I/O error occurs while reading from 181 * the underlying data source. 182 */ 183 inline virtual vpr::Uint32 readUint32(); 184 185 /** 186 * @throw EOFException If end of file is reached while reading. 187 * @throw IOException If some other I/O error occurs while reading from 188 * the underlying data source. 189 */ 190 inline virtual vpr::Uint64 readUint64(); 191 192 /** 193 * @throw EOFException If end of file is reached while reading. 194 * @throw IOException If some other I/O error occurs while reading from 195 * the underlying data source. 196 */ 197 inline virtual float readFloat(); 198 199 /** 200 * @throw EOFException If end of file is reached while reading. 201 * @throw IOException If some other I/O error occurs while reading from 202 * the underlying data source. 203 */ 204 inline virtual double readDouble(); 205 206 /** 207 * @throw EOFException If end of file is reached while reading. 208 * @throw IOException If some other I/O error occurs while reading from 209 * the underlying data source. 210 */ 211 inline virtual std::string readString(); 212 213 /** 214 * @throw EOFException If end of file is reached while reading. 215 * @throw IOException If some other I/O error occurs while reading from 216 * the underlying data source. 217 */ 218 inline virtual bool readBool(); 217 219 218 220 /** @name Helper methods */ … … 224 226 * the underlying data source. 225 227 */ 226 virtual void readUint8(vpr::Uint8& val) throw (IOException)228 virtual void readUint8(vpr::Uint8& val) 227 229 { 228 230 val = this->readUint8(); … … 234 236 * the underlying data source. 235 237 */ 236 virtual void readUint16(vpr::Uint16& val) throw (IOException)238 virtual void readUint16(vpr::Uint16& val) 237 239 { 238 240 val = this->readUint16(); … … 244 246 * the underlying data source. 245 247 */ 246 virtual void readUint32(vpr::Uint32& val) throw (IOException)248 virtual void readUint32(vpr::Uint32& val) 247 249 { 248 250 val = this->readUint32(); … … 254 256 * the underlying data source. 255 257 */ 256 virtual void readUint64(vpr::Uint64& val) throw (IOException)258 virtual void readUint64(vpr::Uint64& val) 257 259 { 258 260 val = this->readUint64(); … … 264 266 * the underlying data source. 265 267 */ 266 virtual void readFloat(float& val) throw (IOException)268 virtual void readFloat(float& val) 267 269 { 268 270 val = this->readFloat(); … … 274 276 * the underlying data source. 275 277 */ 276 virtual void readDouble(double& val) throw (IOException)278 virtual void readDouble(double& val) 277 279 { 278 280 val = this->readDouble(); … … 284 286 * the underlying data source. 285 287 */ 286 virtual void readString(std::string& str) throw (IOException)288 virtual void readString(std::string& str) 287 289 { 288 290 str = this->readString(); … … 294 296 * the underlying data source. 295 297 */ 296 virtual void readBool(bool& val) throw (IOException)298 virtual void readBool(bool& val) 297 299 { 298 300 val = this->readBool(); … … 307 309 * DO NOT MODIFY THE DATA and DO NOT RELY ON THE DATA STAYING THERE 308 310 * LONG. 309 */ 310 inline vpr::Uint8* readRaw(const unsigned int len = 1) throw (IOException); 311 * @throws vpr::IOException if the operation failed. 312 */ 313 inline vpr::Uint8* readRaw(const unsigned int len = 1); 311 314 312 315 public: … … 316 319 }; 317 320 318 inline vpr::Uint8 BufferObjectReader::readUint8() throw (IOException)321 inline vpr::Uint8 BufferObjectReader::readUint8() 319 322 { 320 323 vpr::Uint8 temp_data; … … 323 326 } 324 327 325 inline vpr::Uint16 BufferObjectReader::readUint16() throw (IOException)328 inline vpr::Uint16 BufferObjectReader::readUint16() 326 329 { 327 330 vpr::Uint16 nw_val; … … 331 334 } 332 335 333 inline vpr::Uint32 BufferObjectReader::readUint32() throw (IOException)336 inline vpr::Uint32 BufferObjectReader::readUint32() 334 337 { 335 338 vpr::Uint32 nw_val; … … 339 342 } 340 343 341 inline vpr::Uint64 BufferObjectReader::readUint64() throw (IOException)344 inline vpr::Uint64 BufferObjectReader::readUint64() 342 345 { 343 346 vpr::Uint64 nw_val; … … 348 351 } 349 352 350 inline float BufferObjectReader::readFloat() throw (IOException)353 inline float BufferObjectReader::readFloat() 351 354 { 352 355 // We are reading the float as a 4 byte value … … 360 363 } 361 364 362 inline double BufferObjectReader::readDouble() throw (IOException)365 inline double BufferObjectReader::readDouble() 363 366 { 364 367 // We are reading the double as a 8 byte value … … 373 376 } 374 377 375 inline std::string BufferObjectReader::readString() throw (IOException)378 inline std::string BufferObjectReader::readString() 376 379 { 377 380 // Note: If you change this, you need to change STRING_LENGTH_SIZE … … 387 390 } 388 391 389 inline bool BufferObjectReader::readBool() throw (IOException)392 inline bool BufferObjectReader::readBool() 390 393 { 391 394 return (bool)*(readRaw(1)); … … 393 396 394 397 inline vpr::Uint8* BufferObjectReader::readRaw(const unsigned int len) 395 throw (IOException)396 398 { 397 399 if ( mCurHeadPos >= mData->size() ) juggler/trunk/modules/vapor/vpr/IO/BufferObjectWriter.cpp
r18824 r18825 61 61 } 62 62 63 BufferObjectWriter::~BufferObjectWriter() throw ()63 BufferObjectWriter::~BufferObjectWriter() 64 64 { 65 65 if(mOwnDataBuffer) juggler/trunk/modules/vapor/vpr/IO/BufferObjectWriter.h
r18824 r18825 78 78 const unsigned int curPos = 0); 79 79 80 virtual ~BufferObjectWriter() throw ();80 virtual ~BufferObjectWriter(); 81 81 82 82 void setCurPos(unsigned int val) … … 103 103 * data source. 104 104 */ 105 virtual void beginTag(const std::string& tagName) throw (IOException)105 virtual void beginTag(const std::string& tagName) 106 106 { 107 107 boost::ignore_unused_variable_warning(tagName); … … 114 114 * data source. 115 115 */ 116 virtual void endTag() throw (IOException)116 virtual void endTag() 117 117 { 118 118 /* Do nothing. */ ; … … 126 126 */ 127 127 virtual void beginAttribute(const std::string& attributeName) 128 throw (IOException)129 128 { 130 129 boost::ignore_unused_variable_warning(attributeName); … … 137 136 * data source. 138 137 */ 139 virtual void endAttribute() throw (IOException)138 virtual void endAttribute() 140 139 { 141 140 /* Do nothing. */ ; … … 150 149 * data source. 151 150 */ 152 virtual void writeUint8(vpr::Uint8 val) throw (IOException);153 154 /** 155 * @throw IOException If I/O errors occur while writing to the underlying 156 * data source. 157 */ 158 virtual void writeUint16(vpr::Uint16 val) throw (IOException);159 160 /** 161 * @throw IOException If I/O errors occur while writing to the underlying 162 * data source. 163 */ 164 virtual void writeUint32(vpr::Uint32 val) throw (IOException);165 166 /** 167 * @throw IOException If I/O errors occur while writing to the underlying 168 * data source. 169 */ 170 virtual void writeUint64(vpr::Uint64 val) throw (IOException);171 172 /** 173 * @throw IOException If I/O errors occur while writing to the underlying 174 * data source. 175 */ 176 virtual void writeFloat(float val) throw (IOException);177 178 /** 179 * @throw IOException If I/O errors occur while writing to the underlying 180 * data source. 181 */ 182 virtual void writeDouble(double val) throw (IOException);183 184 /** 185 * @throw IOException If I/O errors occur while writing to the underlying 186 * data source. 187 */ 188 virtual void writeString(std::string val) throw (IOException);189 190 /** 191 * @throw IOException If I/O errors occur while writing to the underlying 192 * data source. 193 */ 194 virtual void writeBool(bool val) throw (IOException);151 virtual void writeUint8(vpr::Uint8 val); 152 153 /** 154 * @throw IOException If I/O errors occur while writing to the underlying 155 * data source. 156 */ 157 virtual void writeUint16(vpr::Uint16 val); 158 159 /** 160 * @throw IOException If I/O errors occur while writing to the underlying 161 * data source. 162 */ 163 virtual void writeUint32(vpr::Uint32 val); 164 165 /** 166 * @throw IOException If I/O errors occur while writing to the underlying 167 * data source. 168 */ 169 virtual void writeUint64(vpr::Uint64 val); 170 171 /** 172 * @throw IOException If I/O errors occur while writing to the underlying 173 * data source. 174 */ 175 virtual void writeFloat(float val); 176 177 /** 178 * @throw IOException If I/O errors occur while writing to the underlying 179 * data source. 180 */ 181 virtual void writeDouble(double val); 182 183 /** 184 * @throw IOException If I/O errors occur while writing to the underlying 185 * data source. 186 */ 187 virtual void writeString(std::string val); 188 189 /** 190 * @throw IOException If I/O errors occur while writing to the underlying 191 * data source. 192 */ 193 virtual void writeBool(bool val); 195 194 196 195 /** 197 196 * Writes raw data of length \p len. 197 * @throws vpr::IOException if the operation failed. 198 198 */ 199 199 inline void writeRaw(vpr::Uint8* data, 200 const unsigned int len = 1) 201 throw (IOException); 200 const unsigned int len = 1); 202 201 203 202 private: … … 218 217 }; 219 218 220 inline void BufferObjectWriter::writeUint8(vpr::Uint8 val) throw (IOException)219 inline void BufferObjectWriter::writeUint8(vpr::Uint8 val) 221 220 { 222 221 writeRaw(&val, 1); … … 224 223 225 224 inline void BufferObjectWriter::writeUint16(vpr::Uint16 val) 226 throw (IOException)227 225 { 228 226 vpr::Uint16 nw_val = vpr::System::Htons(val); … … 232 230 233 231 inline void BufferObjectWriter::writeUint32(vpr::Uint32 val) 234 throw (IOException)235 232 { 236 233 vpr::Uint32 nw_val = vpr::System::Htonl(val); … … 240 237 241 238 inline void BufferObjectWriter::writeUint64(vpr::Uint64 val) 242 throw (IOException)243 239 { 244 240 vpr::Uint64 nw_val = vpr::System::Htonll(val); … … 247 243 } 248 244 249 inline void BufferObjectWriter::writeFloat(float val) throw (IOException)245 inline void BufferObjectWriter::writeFloat(float val) 250 246 { 251 247 // We are writing the float as a 4 byte value … … 256 252 } 257 253 258 inline void BufferObjectWriter::writeDouble(double val) throw (IOException)254 inline void BufferObjectWriter::writeDouble(double val) 259 255 { 260 256 // We are writing the double as a 8 byte value … … 266 262 267 263 inline void BufferObjectWriter::writeString(std::string val) 268 throw (IOException)269 264 { 270 265 // Note: If you change this, you need to change STRING_LENGTH_SIZE … … 277 272 } 278 273 279 inline void BufferObjectWriter::writeBool(bool val) throw (IOException)274 inline void BufferObjectWriter::writeBool(bool val) 280 275 { 281 276 // Darwin uses four bytes (!) for bools. … … 290 285 inline void BufferObjectWriter::writeRaw(vpr::Uint8* data, 291 286 const unsigned int len) 292 throw (IOException)293 287 { 294 288 for ( unsigned int i = 0; i < len; ++i ) juggler/trunk/modules/vapor/vpr/IO/FileHandle_t.h
r18824 r18825 118 118 * @throws vpr::IOException if the file handle could not be opened. 119 119 */ 120 virtual void open() throw (IOException)120 virtual void open() 121 121 { 122 122 mHandleImpl.open(); … … 133 133 * @throws vpr::IOException if the file handle could not be closed. 134 134 */ 135 virtual void close() throw (IOException)135 virtual void close() 136 136 { 137 137 return mHandleImpl.close(); … … 147 147 * @throws vpr::IOException if the blocking mode could not be set. 148 148 */ 149 virtual void setBlocking(bool blocking) throw (IOException)149 virtual void setBlocking(bool blocking) 150 150 { 151 151 mHandleImpl.setBlocking(blocking); … … 234 234 * for some reason. 235 235 */ 236 void setAppend(bool flag) throw (IOException)236 void setAppend(bool flag) 237 237 { 238 238 mHandleImpl.setAppend(flag); … … 253 253 * for some reason. 254 254 */ 255 void setSynchronousWrite(bool flag) throw (IOException)255 void setSynchronousWrite(bool flag) 256 256 { 257 257 return mHandleImpl.setSynchronousWrite(flag); … … 333 333 vpr::Uint32& bytesRead, 334 334 const vpr::Interval timeout = vpr::Interval::NoTimeout) 335 throw (IOException)336 335 { 337 336 mHandleImpl.read_i(buffer, length, bytesRead, timeout); … … 365 364 vpr::Uint32& bytesRead, 366 365 const vpr::Interval timeout = vpr::Interval::NoTimeout) 367 throw (IOException)368 366 { 369 367 mHandleImpl.readn_i(buffer, length, bytesRead, timeout); … … 396 394 vpr::Uint32& bytesWritten, 397 395 const vpr::Interval timeout = vpr::Interval::NoTimeout) 398 throw (IOException)399 396 { 400 397 mHandleImpl.write_i(buffer, length, bytesWritten, timeout); juggler/trunk/modules/vapor/vpr/IO/ObjectReader.cpp
r18824 r18825 55 55 } 56 56 57 ObjectReader::~ObjectReader() throw ()57 ObjectReader::~ObjectReader() 58 58 { 59 59 /* Do nothing. */ ; juggler/trunk/modules/vapor/vpr/IO/ObjectReader.h
r18824 r18825 59 59 60 60 public: 61 virtual ~ObjectReader() throw ();61 virtual ~ObjectReader(); 62 62 63 63 /** … … 100 100 * the underlying data source. 101 101 */ 102 virtual void beginTag(const std::string& tagName) throw (IOException)= 0;102 virtual void beginTag(const std::string& tagName) = 0; 103 103 104 104 /** … … 109 109 * the underlying data source. 110 110 */ 111 virtual void endTag() throw (IOException)= 0;111 virtual void endTag() = 0; 112 112 113 113 /** … … 118 118 * the underlying data source. 119 119 */ 120 virtual void beginAttribute(const std::string& attributeName) 121 throw (IOException) = 0; 120 virtual void beginAttribute(const std::string& attributeName) = 0; 122 121 123 122 /** … … 128 127 * the underlying data source. 129 128 */ 130 virtual void endAttribute() throw (IOException)= 0;129 virtual void endAttribute() = 0; 131 130 //@} 132 131 … … 152 151 * the underlying data source. 153 152 */ 154 virtual vpr::Uint8 readUint8() throw (IOException)= 0;155 156 /** 157 * @throw EOFException If end of file is reached while reading. 158 * @throw IOException If some other I/O error occurs while reading from 159 * the underlying data source. 160 */ 161 virtual vpr::Uint16 readUint16() throw (IOException)= 0;162 163 /** 164 * @throw EOFException If end of file is reached while reading. 165 * @throw IOException If some other I/O error occurs while reading from 166 * the underlying data source. 167 */ 168 virtual vpr::Uint32 readUint32() throw (IOException)= 0;169 170 /** 171 * @throw EOFException If end of file is reached while reading. 172 * @throw IOException If some other I/O error occurs while reading from 173 * the underlying data source. 174 */ 175 virtual vpr::Uint64 readUint64() throw (IOException)= 0;176 177
