boost/quickbook
2
0
Fork 0
mirror of https://github.com/boostorg/quickbook.git synced 2026-01-26 18:52:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge the 1.5.2 changes from trunk.

Browse Source 
[SVN r62830]
This commit is contained in:
Daniel James
2010-06-12 08:29:53 +00:00
parent f50dee9a1c
commit e529faf7ba
62 changed files with 1569 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
quickbook.cpp
View File

@@ -30,7 +30,7 @@
#pragma warning(disable:4355)
#endif
#define QUICKBOOK_VERSION "Quickbook Version 1.5.2"
#define QUICKBOOK_VERSION "Quickbook Spirit 2 port"
namespace quickbook
{
@@ -153,7 +153,7 @@ namespace quickbook
{
int result = 0;
std::ofstream fileout(fileout_);
fs::path outdir = fs::path(fileout_, fs::native).branch_path();
fs::path outdir = fs::path(fileout_).parent_path();
if (outdir.empty())
outdir = ".";
if (pretty_print)
@@ -203,7 +203,7 @@ main(int argc, char* argv[])
using boost::program_options::positional_options_description;
// First thing, the filesystem should record the current working directory.
boost::filesystem::initial_path();
boost::filesystem::initial_path<boost::filesystem::path>();
options_description desc("Allowed options");
desc.add_options()