diff options
Diffstat (limited to 'include/swmodule.h')
| -rw-r--r-- | include/swmodule.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/swmodule.h b/include/swmodule.h index b8c2075..a7f51a1 100644 --- a/include/swmodule.h +++ b/include/swmodule.h @@ -3,7 +3,7 @@ * types of modules (e.g. texts, commentaries, maps, lexicons, * etc.) * -* $Id: swmodule.h,v 1.54 2002/09/30 10:34:43 dglassey Exp $ +* $Id: swmodule.h,v 1.56 2002/10/01 22:04:58 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -35,7 +35,7 @@ #include <defs.h> #include <multimapwdef.h> - +SWORD_NAMESPACE_START #define SWMODULE_OPERATORS \ operator const char *() { return RenderText(); } \ @@ -50,11 +50,11 @@ SWModule &operator =(SW_POSITION p) { setPosition(p); return *this; } -typedef list < SWFilter * >FilterList; +typedef std::list < SWFilter * >FilterList; -typedef map < string, string, less < string > > AttributeValue; -typedef map < string, AttributeValue, less < string > > AttributeList; -typedef map < string, AttributeList, less < string > > AttributeTypeList; +typedef std::map < std::string, std::string, std::less < std::string > > AttributeValue; +typedef std::map < std::string, AttributeValue, std::less < std::string > > AttributeList; +typedef std::map < std::string, AttributeList, std::less < std::string > > AttributeTypeList; #define SWTextDirection char #define SWTextEncoding char @@ -574,4 +574,6 @@ protected: SWMODULE_OPERATORS }; + +SWORD_NAMESPACE_END #endif |