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@17380 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Sep 25, 2013
1 parent 2e3bb38 commit 17b3996
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 56 deletions.
80 changes: 40 additions & 40 deletions SimulationRuntime/cpp/Solver/Kinsol/FactoryExport.cpp
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@

#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_kinsol(boost::extensions::factory_map & fm)
{
fm.get<IAlgLoopSolver,int,IAlgLoop*, INonLinSolverSettings*>()[1].set<Kinsol>();
fm.get<INonLinSolverSettings,int >()[2].set<KinsolSettings>();
}

#elif defined(OMC_BUILD)

#include "Kinsol.h"
#include "KinsolSettings.h"


using boost::extensions::factory;

BOOST_EXTENSION_TYPE_MAP_FUNCTION {
types.get<std::map<std::string, factory<IAlgLoopSolver,IAlgLoop*, INonLinSolverSettings*> > >()
["kinsol"].set<Kinsol>();
types.get<std::map<std::string, factory<INonLinSolverSettings> > >()
["kinsolSettings"].set<KinsolSettings>();
}


#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_kinsol(boost::extensions::factory_map & fm)
{
fm.get<IAlgLoopSolver,int,IAlgLoop*, INonLinSolverSettings*>()[1].set<Kinsol>();
fm.get<INonLinSolverSettings,int >()[2].set<KinsolSettings>();
}

#elif defined(OMC_BUILD)

#include "Kinsol.h"
#include "KinsolSettings.h"


using boost::extensions::factory;

BOOST_EXTENSION_TYPE_MAP_FUNCTION {
types.get<std::map<std::string, factory<IAlgLoopSolver,IAlgLoop*, INonLinSolverSettings*> > >()
["kinsol"].set<Kinsol>();
types.get<std::map<std::string, factory<INonLinSolverSettings> > >()
["kinsolSettings"].set<KinsolSettings>();
}


#else
error "operating system not supported"
#endif




32 changes: 16 additions & 16 deletions SimulationRuntime/cpp/Solver/Kinsol/FactoryExport.h
Original file line number Diff line number Diff line change
@@ -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 17b3996

Please sign in to comment.