Permalink
Browse files

Use only local assert.h and rlog/rlog.h.

  • Loading branch information...
1 parent 9d5137d commit 913897f424af319a0fa67d5356454de1512efeae @tex tex committed Feb 5, 2011
View
@@ -18,13 +18,10 @@
*/
#include <errno.h>
-#include <assert.h>
#include <algorithm>
#include <iostream>
#include <fstream>
#include <sstream>
-#include <rlog/rlog.h>
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
@@ -43,6 +40,8 @@
#include <boost/archive/portable_binary_oarchive.hpp>
#include "config.h"
+#include "rlog/rlog.h"
+#include "assert.h"
#include "Compress.hpp"
#include "FileUtils.hpp"
@@ -17,10 +17,8 @@
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <cassert>
#include <cstring>
#include <cstdlib>
-#include <rlog/rlog.h>
#include <stdlib.h>
#include <ostream>
#include <iostream>
@@ -31,6 +29,8 @@
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string.hpp>
+#include "rlog/rlog.h"
+
using namespace std;
#include "Lock.hpp"
View
@@ -20,15 +20,13 @@
#include <unistd.h>
#include <utime.h>
#include <errno.h>
-
-#include <assert.h>
#include <iostream>
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <rlog/rlog.h>
+#include "rlog/rlog.h"
+#include "assert.h"
#include "File.hpp"
#include "FileUtils.hpp"
View
@@ -21,14 +21,12 @@
#include <stdint.h>
#include <string.h>
#include <errno.h>
-
+#include <sys/types.h>
#include <iostream>
#include <cassert>
#include "config.h"
-
-#include <sys/types.h>
-#include <rlog/rlog.h>
+#include "rlog/rlog.h"
#include "FileHeader.hpp"
#include "FileUtils.hpp"
View
@@ -17,14 +17,14 @@
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <assert.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <cstdlib>
-#include <rlog/rlog.h>
+#include "rlog/rlog.h"
+#include "assert.h"
#include "FileManager.hpp"
@@ -17,21 +17,23 @@
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <FileRememberXattrs.hpp>
-
#include "config.h"
-#include <rlog/rlog.h>
#include <algorithm>
#include <functional>
#include <errno.h>
#include <sys/types.h>
+
#if defined(HAVE_ATTR_XATTR_H)
# include <attr/xattr.h>
#elif defined(HAVE_SYS_XATTR_H)
# include <sys/xattr.h>
#endif
+#include "rlog/rlog.h"
+
+#include <FileRememberXattrs.hpp>
+
void FileRememberXattrs::read(int fd_source)
{
size_t list_size = 1024;
@@ -19,24 +19,23 @@
#include "config.h"
-#include <assert.h>
#include <sys/fsuid.h>
#include <dirent.h>
#include <sys/types.h>
#include <string.h>
#include <sched.h>
#include <errno.h>
-
#include <cstdlib>
#include <iostream>
-#include <rlog/rlog.h>
-
#if defined(HAVE_ATTR_XATTR_H)
# include <attr/xattr.h>
#elif defined(HAVE_SYS_XATTR_H)
# include <sys/xattr.h>
#endif
+#include "rlog/rlog.h"
+#include "assert.h"
+
#include "FuseCompress.hpp"
#include "FileManager.hpp"
View
@@ -17,13 +17,13 @@
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "LayerMap.hpp"
-
#include <algorithm>
-#include <cassert>
#include <boost/io/ios_state.hpp>
-#include <rlog/rlog.h>
+
+#include "rlog/rlog.h"
+
+#include "LayerMap.hpp"
using namespace std;
View
@@ -19,16 +19,16 @@
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "LinearMap.hpp"
-
#include <errno.h>
#include <stdlib.h>
-#include <cassert>
-#include <rlog/rlog.h>
+#include "rlog/rlog.h"
+#include "assert.h"
#include <boost/io/ios_state.hpp>
+#include "LinearMap.hpp"
+
extern size_t g_BufferedMemorySize;
LinearMap::LinearMap()
View
@@ -20,17 +20,17 @@
#include <algorithm>
#include <iostream>
#include <sstream>
-#include <rlog/rlog.h>
#include <errno.h>
#include <cstring>
-
-#include <assert.h>
#include <signal.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include "rlog/rlog.h"
+#include "assert.h"
+
#include "FileUtils.hpp"
#include "Memory.hpp"
#include "LinearMap.hpp"
View
@@ -23,7 +23,8 @@
#include <pthread.h>
#include <signal.h>
#include <string.h>
-#include <rlog/rlog.h>
+
+#include "rlog/rlog.h"
class Mutex
{
View
@@ -20,8 +20,8 @@
#ifndef ASSERT_H
#define ASSERT_H
-#include <rlog/rlog.h>
#include <stdlib.h>
+#include "rlog/rlog.h"
#define assert(eval) \
if (!(eval)) { \
View
@@ -40,7 +40,7 @@
#include <vector>
#include <string>
-#include <rlog/rlog.h>
+#include "rlog/rlog.h"
using namespace std;
@@ -30,7 +30,7 @@
#include <cstdlib>
#include <limits.h>
-#include <rlog/rlog.h>
+#include "rlog/rlog.h"
#include "Compress.hpp"
#include "CompressedMagic.hpp"
@@ -11,7 +11,7 @@
#include <cstdlib>
#include <limits.h>
-#include <rlog/rlog.h>
+#include "rlog/rlog.h"
#include "Compress.hpp"
#include "CompressedMagic.hpp"
@@ -1,10 +1,10 @@
-#include "FileRememberXattrs.hpp"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <rlog/rlog.h>
+#include "rlog/rlog.h"
+
+#include "FileRememberXattrs.hpp"
#include "CompressedMagic.hpp"
#include "CompressionType.hpp"

0 comments on commit 913897f

Please sign in to comment.