Skip to content

GitLab

Merged
Created by Cristian Rodríguez Bernal@crodriguezDeveloper

Fixed Visual Studio 2015 compilation

1 unresolved thread
Compare
and
4 files
+ 19
- 6
fi‎res‎
Obj‎ect‎
Obje‎ct.h‎ +7 -2
Prop‎erty‎
Property‎Caster.h‎ +7 -3
CMakeLi‎sts.txt‎ +4 -1
Change‎log.md‎ +1 -0
fires/Object/Object.h
+ 7
- 2
Show all unchanged lines Show 20 lines
namespace fires
{
class FIRES_API ObjectProperties
class ObjectProperties
: public std::map< PropertyGID, Property >
{
public:
FIRES_API
ObjectProperties( void );
FIRES_API
void registerProperty( const std::string& label,
const Property& property );
FIRES_API
bool unregisterProperty( const std::string& label );
FIRES_API
Property& get( const std::string& label );
FIRES_API
const Property& get( const std::string& label ) const;
FIRES_API
bool set( const std::string& label, const Property& property );
}; // class ObjectProperties
Show 20 lines Show all unchanged lines
fires/Property/PropertyCaster.h
+ 7
- 3
Show all unchanged lines Show 20 lines
{
std::ostringstream iss;
// Avoiding choose int over unsigned int for enum types
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-promo"
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-promo"
#endif
iss << (( T ) property.value< T >( ));
#pragma GCC diagnostic pop
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
return std::string( iss.str( ));
}
};
Show 20 lines Show all unchanged lines
CMakeLists.txt
+ 4
- 1
Show all unchanged lines Show 20 lines
#
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
cmake_minimum_required( VERSION 3.1 FATAL_ERROR )
project( FiReS VERSION 0.1.2 )
project( FiReS VERSION 0.1.3 )
set( FiReS_VERSION_ABI 3 )
list( APPEND CMAKE_MODULE_PATH
Show 20 lines Show all unchanged lines Show 20 lines
common_find_package( OpenMP )
common_find_package_post( )
# Allow warnings
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
Please register or sign in to reply
set( FIRES_DEPENDENT_LIBRARIES Boost )
add_subdirectory( fires )
Show 20 lines Show all unchanged lines
Changelog.md
+ 1
- 0
# FiReS
## git master
* [!18] Fixed Visual Studio 14 compilation.
* [!16] Added property gid getters in PropertyManager
* [!15] Added notifier/observer functionallity
* [!14] Added property manager