archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2026-02-01 17:36:36 +00:00
Code Issues Projects Releases Wiki Activity

+ cleanup

Browse Source
This commit is contained in:
artemp 2013-01-15 14:06:15 +00:00
parent e4bc9cab8d
commit f1d142a3c1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/mapnik/enumeration.hpp
View File

@ -135,19 +135,19 @@ protected:
* @endcode
*/
template <class ENUM, int THE_MAX>
template <typename ENUM, int THE_MAX>
class MAPNIK_DECL enumeration {
public:
typedef ENUM native_type;
enumeration()
: value_() {}
: value_() {}
enumeration( ENUM v )
: value_(v) {}
: value_(v) {}
enumeration( const enumeration & other )
: value_(other.value_) {}
enumeration( enumeration const& other )
: value_(other.value_) {}
/** Assignment operator for native enum values. */
void operator=(ENUM v)
@ -156,7 +156,7 @@ public:
}
/** Assignment operator. */
void operator=(const enumeration & other)
void operator=(enumeration const& other)
{
value_ = other.value_;
}
@ -220,7 +220,7 @@ public:
{
from_string( word );
}
catch (const illegal_enum_value &)
catch (illegal_enum_value const&)
{
is.setstate(std::ios::failbit);
}
@ -256,8 +256,8 @@ public:
if (our_strings_[i] == 0 )
{
std::cerr << "### FATAL: Not enough strings for enum "
<< our_name_ << " defined in file '" << filename
<< "' at line " << line_no;
<< our_name_ << " defined in file '" << filename
<< "' at line " << line_no;
}
}
if ( std::string("") != our_strings_[THE_MAX])