>From Matt Benjamin <mbenja...@redhat.com>: Matt Benjamin has uploaded a new change for review.
https://review.gerrithub.io/242321 Change subject: c++ header compilation: remove export token, others ...................................................................... c++ header compilation: remove export token, others Adjust the structure of headers currently included from cache_inode.h and export_mgr.h to permit compilation by a modern c++ compiler. The main conflicts resolved: * s/new/<something>/; * s/private/private_data/ in fsal_filesystem * s/export as a token/a qualified token/; * adjust some operations on void pointers and disallowed int conversions Change-Id: Idc21fccf375378793d7e527be89662c7242481b1 Signed-off-by: Matt Benjamin <mbenja...@redhat.com> --- M src/FSAL/FSAL_GPFS/export.c M src/FSAL/FSAL_GPFS/fsal_attrs.c M src/FSAL/FSAL_GPFS/fsal_create.c M src/FSAL/FSAL_GPFS/fsal_ds.c M src/FSAL/FSAL_GPFS/fsal_fileop.c M src/FSAL/FSAL_GPFS/fsal_internal.c M src/FSAL/FSAL_GPFS/fsal_lock.c M src/FSAL/FSAL_GPFS/fsal_lookup.c M src/FSAL/FSAL_GPFS/fsal_mds.c M src/FSAL/FSAL_GPFS/fsal_rename.c M src/FSAL/FSAL_GPFS/fsal_symlinks.c M src/FSAL/FSAL_GPFS/fsal_unlink.c M src/FSAL/FSAL_GPFS/handle.c M src/FSAL/FSAL_PSEUDO/export.c M src/FSAL/FSAL_VFS/export.c M src/FSAL/FSAL_VFS/handle.c M src/FSAL/Stackable_FSALs/FSAL_NULL/export.c M src/FSAL_UP/fsal_up_top.c M src/MainNFSD/nfs_worker_thread.c M src/Protocols/9P/9p_attach.c M src/Protocols/9P/9p_proto_tools.c M src/Protocols/NFS/mnt_Export.c M src/Protocols/NFS/mnt_Mnt.c M src/Protocols/NFS/nfs3_create.c M src/Protocols/NFS/nfs3_fsinfo.c M src/Protocols/NFS/nfs3_lookup.c M src/Protocols/NFS/nfs3_mkdir.c M src/Protocols/NFS/nfs3_mknod.c M src/Protocols/NFS/nfs3_read.c M src/Protocols/NFS/nfs3_readdir.c M src/Protocols/NFS/nfs3_readdirplus.c M src/Protocols/NFS/nfs3_symlink.c M src/Protocols/NFS/nfs3_write.c M src/Protocols/NFS/nfs4_Compound.c M src/Protocols/NFS/nfs4_op_create.c M src/Protocols/NFS/nfs4_op_getdevicelist.c M src/Protocols/NFS/nfs4_op_layoutget.c M src/Protocols/NFS/nfs4_op_layoutreturn.c M src/Protocols/NFS/nfs4_op_lock.c M src/Protocols/NFS/nfs4_op_lookup.c M src/Protocols/NFS/nfs4_op_lookupp.c M src/Protocols/NFS/nfs4_op_open.c M src/Protocols/NFS/nfs4_op_putfh.c M src/Protocols/NFS/nfs4_op_putrootfh.c M src/Protocols/NFS/nfs4_op_read.c M src/Protocols/NFS/nfs4_op_readdir.c M src/Protocols/NFS/nfs4_op_restorefh.c M src/Protocols/NFS/nfs4_op_savefh.c M src/Protocols/NFS/nfs4_op_secinfo.c M src/Protocols/NFS/nfs4_op_secinfo_no_name.c M src/Protocols/NFS/nfs4_op_write.c M src/Protocols/NFS/nfs4_pseudo.c M src/Protocols/NFS/nfs_proto_tools.c M src/Protocols/NLM/nlm_Cancel.c M src/Protocols/NLM/nlm_Granted_Res.c M src/Protocols/NLM/nlm_Lock.c M src/Protocols/NLM/nlm_Share.c M src/Protocols/NLM/nlm_Test.c M src/Protocols/NLM/nlm_Unlock.c M src/Protocols/NLM/nlm_Unshare.c M src/SAL/nfs4_state.c M src/SAL/nlm_state.c M src/SAL/state_deleg.c M src/SAL/state_lock.c M src/SAL/state_share.c M src/cache_inode/cache_inode_get.c M src/cache_inode/cache_inode_getattr.c M src/cache_inode/cache_inode_lookup.c M src/cache_inode/cache_inode_lookupp.c M src/cache_inode/cache_inode_misc.c M src/cache_inode/cache_inode_rdwr.c M src/cache_inode/cache_inode_statfs.c M src/config_parsing/config_parsing.c M src/gtest/test_ci_hash_dist1.cc M src/include/avltree.h M src/include/cache_inode.h M src/include/config_parsing.h M src/include/export_mgr.h M src/include/fsal.h M src/include/fsal_api.h M src/include/fsal_types.h M src/include/gsh_list.h M src/include/gsh_rpc.h M src/include/log.h M src/libntirpc M src/support/exports.c M src/support/nfs_creds.c M src/support/nfs_filehandle_mgmt.c M src/support/server_stats.c 89 files changed, 502 insertions(+), 485 deletions(-) git pull ssh://review.gerrithub.io:29418/ffilz/nfs-ganesha refs/changes/21/242321/1 -- To view, visit https://review.gerrithub.io/242321 To unsubscribe, visit https://review.gerrithub.io/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc21fccf375378793d7e527be89662c7242481b1 Gerrit-PatchSet: 1 Gerrit-Project: ffilz/nfs-ganesha Gerrit-Branch: next Gerrit-Owner: Matt Benjamin <mbenja...@redhat.com> ------------------------------------------------------------------------------ _______________________________________________ Nfs-ganesha-devel mailing list Nfs-ganesha-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel
