← Back to branch summary

~ubuntu-branches/debian/sid/gmsh/sid

« back to all changes in this revision

Viewing changes to Common/OpenFile.cpp

  • Committer: Package Import Robot
  • Author(s): Anton Gladky
  • Date: 2015-08-26 22:45:27 UTC
  • mfrom: (1.3.25)
  • Revision ID: package-import@ubuntu.com-20150826224527-wiqnz3dwz6ap8tty
Tags: 2.10.1+dfsg1-1
http://bugs.debian.org/793245
* [4c450d1] Update d/watch.
* [90ca918] Imported Upstream version 2.10.1+dfsg1. (Closes: #793245)
* [af26665] Use any-arch instead of list of archs.
* [e94c6d2] Refresh patches.
* [6ab417f] Update d/copyright.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Common/OpenFile.cpp
27
27
 
28
28
#if defined(HAVE_PARSER)
29
29
#include "Parser.h"
 
30
#include "FunctionManager.h"
30
31
#endif
31
32
 
32
33
#if defined(HAVE_MESH)
673
674
#if defined(HAVE_PARSER)
674
675
  gmsh_yysymbols.clear();
675
676
  gmsh_yystringsymbols.clear();
676
 
  std::map<std::string, double> cln(Msg::GetCommandLineNumbers());
677
 
  for(std::map<std::string, double>::iterator it = cln.begin(); it != cln.end(); it++)
678
 
    gmsh_yysymbols[it->first].value = std::vector<double>(1, it->second);
 
677
  std::map<std::string, std::vector<double> > cln(Msg::GetCommandLineNumbers());
 
678
  for(std::map<std::string, std::vector<double> >::iterator it = cln.begin(); it != cln.end(); it++)
 
679
    gmsh_yysymbols[it->first].value = it->second;
679
680
  std::map<std::string, std::string> cls(Msg::GetCommandLineStrings());
680
681
  for(std::map<std::string, std::string>::iterator it = cls.begin(); it != cls.end(); it++)
681
682
    gmsh_yystringsymbols[it->first] = it->second;
 
683
  FunctionManager::Instance()->clear();
682
684
#endif
683
685
 
684
686
  // temporary hack until we fill the current GModel on the fly during parsing
695
697
    if(tmp[i] != fileName)
696
698
      CTX::instance()->recentFiles.push_back(tmp[i]);
697
699
  }
698
 
  if(CTX::instance()->recentFiles.size() > 10)
699
 
    CTX::instance()->recentFiles.resize(10);
 
700
  CTX::instance()->recentFiles.resize(10);
700
701
#if defined(HAVE_FLTK)
701
702
  if(FlGui::available())
702
703
    FlGui::instance()->graph[0]->fillRecentHistoryMenu();