]>
Commit | Line | Data |
---|---|---|
591b0ad2 JB |
1 | --- qpidc-0.16/src/Makefile.am.orig 2012-02-24 21:05:47.000000000 +0100 |
2 | +++ qpidc-0.16/src/Makefile.am 2012-07-29 13:30:13.075820560 +0200 | |
3 | @@ -137,7 +137,7 @@ | |
4 | tmoduleexecdir = $(libdir)/qpid/tests | |
5 | tmoduleexec_LTLIBRARIES= | |
6 | ||
7 | -AM_CXXFLAGS += -DBOOST_FILESYSTEM_VERSION=2 | |
8 | +AM_CXXFLAGS += -DBOOST_FILESYSTEM_VERSION=3 | |
9 | ||
10 | ## Automake macros to build libraries and executables. | |
11 | qpidd_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduleexecdir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\" | |
12 | --- qpidc-0.16/src/qpid/Modules.cpp.orig 2011-03-14 21:29:02.000000000 +0100 | |
13 | +++ qpidc-0.16/src/qpid/Modules.cpp 2012-07-29 21:31:10.801276183 +0200 | |
14 | @@ -73,7 +73,7 @@ | |
15 | ||
16 | void loadModuleDir (std::string dirname, bool isDefault) | |
17 | { | |
18 | - fs::path dirPath (dirname, fs::native); | |
19 | + fs::path dirPath (dirname); | |
20 | ||
21 | if (!fs::exists (dirPath)) | |
22 | { | |
23 | @@ -89,8 +89,8 @@ | |
24 | fs::directory_iterator endItr; | |
25 | for (fs::directory_iterator itr (dirPath); itr != endItr; ++itr) | |
26 | { | |
27 | - if (!fs::is_directory(*itr) && isShlibName(itr->string())) | |
28 | - tryShlib (itr->string().data(), true); | |
29 | + if (!fs::is_directory(*itr) && isShlibName(itr->path().string())) | |
30 | + tryShlib (itr->path().string().data(), true); | |
31 | } | |
32 | } | |
33 | ||
34 | --- qpidc-0.16/src/qpid/cluster/StoreStatus.cpp.orig 2010-04-01 19:51:04.000000000 +0200 | |
35 | +++ qpidc-0.16/src/qpid/cluster/StoreStatus.cpp 2012-07-29 21:53:14.617887294 +0200 | |
36 | @@ -77,7 +77,7 @@ | |
37 | throw Exception(QPID_MSG("No data-dir: When a store is loaded together with clustering, --data-dir must be specified.")); | |
38 | } | |
39 | try { | |
40 | - fs::path dir = fs::path(dataDir, fs::native)/SUBDIR; | |
41 | + fs::path dir = fs::path(dataDir)/SUBDIR; | |
42 | create_directory(dir); | |
43 | fs::path file = dir/STORE_STATUS; | |
44 | if (fs::exists(file)) { | |
45 | @@ -106,7 +106,7 @@ | |
46 | try { | |
47 | ostringstream os; | |
48 | os << clusterId << endl << shutdownId << endl; | |
49 | - fs::path file = fs::path(dataDir, fs::native)/SUBDIR/STORE_STATUS; | |
50 | + fs::path file = fs::path(dataDir)/SUBDIR/STORE_STATUS; | |
51 | writeFile(file, os.str()); | |
52 | } | |
53 | catch (const std::exception& e) { |