sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into ledger-mode-automatic-transactions

Browse source
This commit is contained in:
Craig Earls 2013-11-06 08:48:54 -07:00
commit 1db0b0892c
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
doc/CMakeLists.txt
View file

@ -96,10 +96,11 @@ if(CMAKE_INSTALL_MANDIR)
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc) DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
endif(CMAKE_INSTALL_MANDIR) endif(CMAKE_INSTALL_MANDIR)
if(CMAKE_INSTALL_DOCDIR) foreach(file ${info_files})
foreach(file ${info_files}) get_filename_component(file_base ${file} NAME_WE)
get_filename_component(file_base ${file} NAME_WE)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file_base}.pdf install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file}
DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc OPTIONAL) DESTINATION ${CMAKE_INSTALL_INFODIR} COMPONENT doc)
endforeach() install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file_base}.pdf
endif(CMAKE_INSTALL_DOCDIR) DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc OPTIONAL)
endforeach()

2
lisp/ledger-mode.el
View file

@ -295,6 +295,6 @@ Can indent, complete or align depending on context."
(provide 'ledger) (provide 'ledger-mode)
;;; ledger-mode.el ends here ;;; ledger-mode.el ends here

2
src/account.h
View file

@ -310,7 +310,7 @@ void put_account(property_tree::ptree& pt, const account_t& acct,
//simple struct added to allow std::map to compare accounts in the accounts report //simple struct added to allow std::map to compare accounts in the accounts report
struct account_compare { struct account_compare {
bool operator() (const account_t& lhs, const account_t& rhs){ bool operator() (const account_t& lhs, const account_t& rhs) const {
return (lhs.fullname().compare(rhs.fullname()) < 0); return (lhs.fullname().compare(rhs.fullname()) < 0);
} }
}; };

2
src/commodity.h
View file

@ -353,7 +353,7 @@ void put_commodity(property_tree::ptree& pt, const commodity_t& comm,
//simple struct to allow std::map to compare commodities names //simple struct to allow std::map to compare commodities names
struct commodity_compare { struct commodity_compare {
bool operator() (const commodity_t* lhs, const commodity_t* rhs){ bool operator() (const commodity_t* lhs, const commodity_t* rhs) const {
return (lhs->symbol().compare(rhs->symbol()) < 0); return (lhs->symbol().compare(rhs->symbol()) < 0);
} }
}; };