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@17840 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Oct 23, 2013
1 parent b111129 commit 48db1c3
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 57 deletions.
82 changes: 41 additions & 41 deletions SimulationRuntime/cpp/Solver/Hybrj/FactoryExport.cpp
@@ -1,42 +1,42 @@

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


#elif defined(SIMSTER_BUILD)

#include "Hybrj.h"
#include "HybrjSettings.h"


/*Simster factory*/
extern "C" void BOOST_EXTENSION_EXPORT_DECL extension_export_hybrj(boost::extensions::factory_map & fm)
{
fm.get<IAlgLoopSolver,int,IAlgLoop*, INonLinSolverSettings*>()[1].set<Hybrj>();
fm.get<INonLinSolverSettings,int >()[2].set<HybrjSettings>();
}

#elif defined(OMC_BUILD)

#include "Hybrj.h"
#include "HybrjSettings.h"


using boost::extensions::factory;

BOOST_EXTENSION_TYPE_MAP_FUNCTION {
types.get<std::map<std::string, factory<IAlgLoopSolver,IAlgLoop*, INonLinSolverSettings*> > >()
["hybrj"].set<Hybrj>();
types.get<std::map<std::string, factory<INonLinSolverSettings> > >()
["hybrjSettings"].set<HybrjSettings>();
}


#else
error "operating system not supported"
#endif




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


#elif defined(SIMSTER_BUILD)

#include "Hybrj.h"
#include "HybrjSettings.h"


/*Simster factory*/
extern "C" void BOOST_EXTENSION_EXPORT_DECL extension_export_hybrj(boost::extensions::factory_map & fm)
{
fm.get<IAlgLoopSolver,int,IAlgLoop*, INonLinSolverSettings*>()[1].set<Hybrj>();
fm.get<INonLinSolverSettings,int >()[2].set<HybrjSettings>();
}

#elif defined(OMC_BUILD)

#include "Hybrj.h"
#include "HybrjSettings.h"


using boost::extensions::factory;

BOOST_EXTENSION_TYPE_MAP_FUNCTION {
types.get<std::map<std::string, factory<IAlgLoopSolver,IAlgLoop*, INonLinSolverSettings*> > >()
["hybrj"].set<Hybrj>();
types.get<std::map<std::string, factory<INonLinSolverSettings> > >()
["hybrjSettings"].set<HybrjSettings>();
}


#else
error "operating system not supported"
#endif




32 changes: 16 additions & 16 deletions SimulationRuntime/cpp/Solver/Hybrj/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 48db1c3

Please sign in to comment.