Commit b66812f0 authored by Christophe Geuzaine's avatar Christophe Geuzaine

avoid naming clashes with getdp

parent 07c0e341
Pipeline #1649 passed with stage
in 71 minutes 11 seconds
......@@ -17,13 +17,13 @@ class File_Position
std::string filename;
};
class mystack
class FunctionManagerStack
{
public:
std::stack<File_Position> s;
};
class mymap
class FunctionManagerMap
{
public:
std::map<std::string, File_Position> m;
......@@ -33,8 +33,8 @@ FunctionManager *FunctionManager::instance = 0;
FunctionManager::FunctionManager()
{
functions = new mymap;
calls = new mystack;
functions = new FunctionManagerMap;
calls = new FunctionManagerStack;
}
FunctionManager *FunctionManager::Instance()
......
......@@ -6,18 +6,18 @@
#ifndef _FUNCTION_MANAGER_H_
#define _FUNCTION_MANAGER_H_
class mystack;
class mymap;
#include <string>
#include "GmshIO.h"
// Singleton, one function manager for all parsers.
class FunctionManagerStack;
class FunctionManagerMap;
class FunctionManager
{
mymap *functions;
mystack *calls;
FunctionManagerMap *functions;
FunctionManagerStack *calls;
FunctionManager ();
static FunctionManager *instance;
public :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment