FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New class simgear::Map extending std::map interface.

Browse Source
This commit is contained in:
Thomas Geymayer 2013-10-27 18:37:19 +01:00
parent 94326fd964
commit 050f3791cc
3 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/nasal/cppbind/cppbind_test.cxx
View File

@ -3,6 +3,7 @@
#include "Ghost.hxx"
#include "NasalHash.hxx"
#include "NasalString.hxx"
#include <simgear/structure/map.hxx>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
@ -256,6 +257,13 @@ int main(int argc, char* argv[])
std::map<std::string, std::vector<int> > int_vector_map;
VERIFY( naIsHash(to_nasal(c, int_vector_map)) );
simgear::StringMap dict =
simgear::StringMap("hello", "value")
("key2", "value2");
naRef na_dict = to_nasal(c, dict);
VERIFY( naIsHash(na_dict) );
VERIFY( Hash(na_dict, c).get<std::string>("key2") == "value2" );
// Check converting to Ghost if using Nasal hashes with actual ghost inside
// the hashes parents vector
std::vector<naRef> parents;

1
simgear/structure/CMakeLists.txt
View File

@ -22,6 +22,7 @@ set(HEADERS
event_mgr.hxx
exception.hxx
intern.hxx
map.hxx
subsystem_mgr.hxx
StateMachine.hxx
)

69
simgear/structure/map.hxx Normal file
View File

@ -0,0 +1,69 @@
///@file Extended std::map with methods for easier usage.
//
// Copyright (C) 2013 Thomas Geymayer <tomgey@gmail.com>
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Library General Public License for more details.
//
// You should have received a copy of the GNU Library General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
#ifndef SG_MAP_HXX_
#define SG_MAP_HXX_
#include <map>
#include <string>
namespace simgear
{
template<class Key, class Value>
class Map:
public std::map<Key, Value>
{
public:
Map() {}
/**
* Initilize a new mape with the given key/value pair.
*/
Map(const Key& key, const Value& value)
{
(*this)[key] = value;
}
/**
* Change/add new value.
*/
Map& operator()(const Key& key, const Value& value)
{
(*this)[key] = value;
return *this;
}
/**
* Retrive a value (or get a default value if it does not exist).
*/
Value get(const Key& key, const Value& def = Value()) const
{
typename Map::const_iterator it = this->find(key);
if( it != this->end() )
return it->second;
return def;
}
};
typedef Map<std::string, std::string> StringMap;
} // namespace simgear
#endif /* SG_MAP_HXX_ */