Skip to content

Commit

Permalink
[Janitor mode] Set auto-props
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17178 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Sep 11, 2013
1 parent 9438ebb commit 95f2681
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 55 deletions.
78 changes: 39 additions & 39 deletions SimulationRuntime/cpp/Solver/CVode/FactoryExport.cpp
@@ -1,40 +1,40 @@

#pragma once
#include "stdafx.h"
#if defined(__vxworks)


#elif defined(SIMSTER_BUILD)

#include "CVode.h"


/*Simster factory*/
extern "C" void BOOST_EXTENSION_EXPORT_DECL extension_export_cvode(boost::extensions::factory_map & fm)
{
fm.get<ISolver,int,IMixedSystem*, ISolverSettings*>()[1].set<Cvode>();
//fm.get<ISolverSettings,int, IGlobalSettings* >()[2].set<CVodeSettings>();
}

#elif defined(OMC_BUILD)

#include "CVode.h"
#include "CVodeSettings.h"

/* OMC factory */
using boost::extensions::factory;

BOOST_EXTENSION_TYPE_MAP_FUNCTION {
types.get<std::map<std::string, factory<ISolver,IMixedSystem*, ISolverSettings*> > >()
["CVodeSolver"].set<Cvode>();
types.get<std::map<std::string, factory<ISolverSettings, IGlobalSettings* > > >()
["CVodeSettings"].set<CVodeSettings>();
}

#else
error "operating system not supported"
#endif




#pragma once
#include "stdafx.h"
#if defined(__vxworks)


#elif defined(SIMSTER_BUILD)

#include "CVode.h"


/*Simster factory*/
extern "C" void BOOST_EXTENSION_EXPORT_DECL extension_export_cvode(boost::extensions::factory_map & fm)
{
fm.get<ISolver,int,IMixedSystem*, ISolverSettings*>()[1].set<Cvode>();
//fm.get<ISolverSettings,int, IGlobalSettings* >()[2].set<CVodeSettings>();
}

#elif defined(OMC_BUILD)

#include "CVode.h"
#include "CVodeSettings.h"

/* OMC factory */
using boost::extensions::factory;

BOOST_EXTENSION_TYPE_MAP_FUNCTION {
types.get<std::map<std::string, factory<ISolver,IMixedSystem*, ISolverSettings*> > >()
["CVodeSolver"].set<Cvode>();
types.get<std::map<std::string, factory<ISolverSettings, IGlobalSettings* > > >()
["CVodeSettings"].set<CVodeSettings>();
}

#else
error "operating system not supported"
#endif




32 changes: 16 additions & 16 deletions SimulationRuntime/cpp/Solver/CVode/FactoryExport.h
@@ -1,16 +1,16 @@
#pragma once

#if defined(__vxworks)

#define BOOST_EXTENSION_SOLVER_DECL
#define BOOST_EXTENSION_SOLVERSETTINGS_DECL
#elif defined(OMC_BUILD) || defined(SIMSTER_BUILD)

#define BOOST_EXTENSION_SOLVER_DECL BOOST_EXTENSION_IMPORT_DECL
#define BOOST_EXTENSION_SOLVERSETTINGS_DECL BOOST_EXTENSION_IMPORT_DECL
#else
error "operating system not supported"
#endif


#pragma once

#if defined(__vxworks)

#define BOOST_EXTENSION_SOLVER_DECL
#define BOOST_EXTENSION_SOLVERSETTINGS_DECL
#elif defined(OMC_BUILD) || defined(SIMSTER_BUILD)

#define BOOST_EXTENSION_SOLVER_DECL BOOST_EXTENSION_IMPORT_DECL
#define BOOST_EXTENSION_SOLVERSETTINGS_DECL BOOST_EXTENSION_IMPORT_DECL
#else
error "operating system not supported"
#endif



0 comments on commit 95f2681

Please sign in to comment.