From: <den...@us...> - 2010-12-03 16:09:03
|
Revision: 390 http://stdair.svn.sourceforge.net/stdair/?rev=390&view=rev Author: denis_arnaud Date: 2010-12-03 16:08:57 +0000 (Fri, 03 Dec 2010) Log Message: ----------- [Branch 0.9.0][API] Fixed a few compilation errors with the new API. Modified Paths: -------------- branches/stdair/0.9.0/main/stdair/basic/BasParserHelperTypes.hpp Modified: branches/stdair/0.9.0/main/stdair/basic/BasParserHelperTypes.hpp =================================================================== --- branches/stdair/0.9.0/main/stdair/basic/BasParserHelperTypes.hpp 2010-12-03 15:58:57 UTC (rev 389) +++ branches/stdair/0.9.0/main/stdair/basic/BasParserHelperTypes.hpp 2010-12-03 16:08:57 UTC (rev 390) @@ -7,11 +7,12 @@ // STL #include <string> #include <sstream> -// STDAIR -#include <stdair/STDAIR_Types.hpp> +// StdAir +#include <stdair/stdair_exceptions.hpp> #include <stdair/service/Logger.hpp> namespace stdair { + // //////////////////////////////////////////////////////////////////// // // Parser structure helper @@ -22,12 +23,14 @@ struct date_time_element { unsigned int _value; - // Constructors. + // ////////// Constructors /////////// + /** Default constructor. */ date_time_element () { } - date_time_element (const date_time_element& t) - : _value (t._value) { } + /** Default copy constructor. */ + date_time_element (const date_time_element& t) : _value (t._value) { } + /** Constructor. */ date_time_element (int i) : _value (i) { } - // Checker. + /** Checker. */ void check () const { if (_value < MIN || _value > MAX) { std::ostringstream oMessage; @@ -38,22 +41,29 @@ } }; - /** Operator overload. */ + /** Operator* overload. */ template <int MIN, int MAX> - inline date_time_element<MIN, MAX> operator* (const date_time_element<MIN, MAX>& o1, const date_time_element<MIN, MAX>& o2) { + inline date_time_element<MIN, + MAX> operator*(const date_time_element<MIN, MAX>& o1, + const date_time_element<MIN, MAX>& o2){ return date_time_element<MIN, MAX> (o1._value * o2._value); } + + /** Operator+ overload. */ template <int MIN, int MAX> - inline date_time_element<MIN, MAX> operator+ (const date_time_element<MIN, MAX>& o1, const date_time_element<MIN, MAX>& o2) { + inline date_time_element<MIN, + MAX> operator+(const date_time_element<MIN, MAX>& o1, + const date_time_element<MIN, MAX>& o2){ return date_time_element<MIN, MAX> (o1._value + o2._value); } - /** Type definitions for the date & time elements. */ + /** Type definitions for the date and time elements. */ typedef date_time_element<0, 23> hour_t; typedef date_time_element<0, 59> minute_t; typedef date_time_element<0, 59> second_t; typedef date_time_element<1900, 2100> year_t; typedef date_time_element<1, 12> month_t; typedef date_time_element<1, 31> day_t; + } #endif // __STDAIR_BAS_BASCOMPARSERHELPERTYPES_HPP This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |