Changeset 19456 for trunk/FACT++
- Timestamp:
- 03/28/19 21:26:04 (6 years ago)
- Location:
- trunk/FACT++/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/InterpreterV8.cc
r18978 r19456 10 10 11 11 #include <boost/tokenizer.hpp> 12 #include <boost/filesystem.hpp> 12 13 #include <boost/algorithm/string/join.hpp> 13 14 … … 745 746 return ThrowException(String::New("File name empty.")); 746 747 747 izstream fin(*file); 748 const auto path = boost::filesystem::path(*file); 749 750 const auto f = path.is_absolute() ? path : boost::filesystem::path(fIncludePath)/path; 751 752 izstream fin(f.string().c_str()); 748 753 if (!fin) 749 754 return ThrowException(String::New(errno!=0?strerror(errno):"Insufficient memory for decompression")); … … 780 785 HandleScope handle_scope; 781 786 782 izstream fin(*file); 787 const auto path = boost::filesystem::path(*file); 788 789 const auto f = path.is_absolute() ? path : boost::filesystem::path(fIncludePath)/path; 790 791 izstream fin(f.string().c_str()); 783 792 if (!fin) 784 793 return ThrowException(String::New(errno!=0?strerror(errno):"Insufficient memory for decompression")); … … 2804 2813 else 2805 2814 { 2815 fIncludePath = boost::filesystem::path(filename).parent_path().string(); 2816 2806 2817 // We call script->Run because it is the only way to 2807 2818 // catch exceptions. -
trunk/FACT++/src/InterpreterV8.h
r18828 r19456 58 58 std::list<Database*> fDatabases; 59 59 #endif 60 61 std::string fIncludePath; 60 62 61 63 #ifdef HAVE_V8
Note:
See TracChangeset
for help on using the changeset viewer.