Browse Source

Merge pull request #305 from trapexit/ugid

rename include cpp files to have icpp extension
pull/309/head
Antonio SJ Musumeci 8 years ago
committed by GitHub
parent
commit
577bc67fa7
  1. 4
      src/ugid.cpp
  2. 4
      src/ugid_linux.hpp
  3. 2
      src/ugid_linux.icpp
  4. 4
      src/ugid_rwlock.hpp
  5. 2
      src/ugid_rwlock.icpp

4
src/ugid.cpp

@ -17,9 +17,9 @@
#include "gidcache.hpp" #include "gidcache.hpp"
#if defined __linux__ and UGID_USE_RWLOCK == 0 #if defined __linux__ and UGID_USE_RWLOCK == 0
#include "ugid_linux.ipp"
#include "ugid_linux.icpp"
#else #else
#include "ugid_rwlock.ipp"
#include "ugid_rwlock.icpp"
#endif #endif
namespace mergerfs namespace mergerfs

4
src/ugid_linux.hpp

@ -14,10 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/types.h>
#include <unistd.h>
#include <grp.h> #include <grp.h>
#include <pwd.h> #include <pwd.h>

2
src/ugid_linux.ipp → src/ugid_linux.icpp

@ -15,9 +15,9 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <sys/syscall.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <sys/syscall.h>
#include <vector> #include <vector>

4
src/ugid_rwlock.hpp

@ -14,10 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include <sys/types.h>
#include <pthread.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <pthread.h>
namespace mergerfs namespace mergerfs
{ {

2
src/ugid_rwlock.ipp → src/ugid_rwlock.icpp

@ -14,10 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <pthread.h>
#include <vector> #include <vector>
Loading…
Cancel
Save