null+****@clear*****
null+****@clear*****
2012年 5月 17日 (木) 10:36:12 JST
Susumu Yata 2012-05-17 10:36:12 +0900 (Thu, 17 May 2012)
New Revision: 3ae77f387892303ecffd7b159abaa5517faa30c0
Log:
Fix preprocessor directives to meet the groonga style (grn_dat).
Modified files:
lib/dat.h
lib/dat/dat.hpp
lib/dat/file-impl.cpp
lib/dat/file-impl.hpp
Modified: lib/dat.h (+1 -1)
===================================================================
--- lib/dat.h 2012-05-17 10:05:36 +0900 (5b22296)
+++ lib/dat.h 2012-05-17 10:36:12 +0900 (9ae15f8)
@@ -18,7 +18,7 @@
#define GRN_DAT_H
#ifndef GROONGA_IN_H
-#include "groonga_in.h"
+# include "groonga_in.h"
#endif /* GROONGA_IN_H */
#include "db.h"
Modified: lib/dat/dat.hpp (+25 -28)
===================================================================
--- lib/dat/dat.hpp 2012-05-17 10:05:36 +0900 (d2a31cd)
+++ lib/dat/dat.hpp 2012-05-17 10:36:12 +0900 (9961de8)
@@ -19,27 +19,27 @@
#define GRN_DAT_COMMON_HPP_
#ifndef _MSC_VER
- #include <stddef.h>
- #include <stdint.h>
+# include <stddef.h>
+# include <stdint.h>
#endif // _MSC_VER
#include <cstddef>
#include <exception>
#ifdef _DEBUG
- #include <iostream>
+# include <iostream>
#endif // _DEBUG
#ifndef GRN_DAT_API
- #ifdef WIN32
- #ifdef GRN_DAT_EXPORT
- #define GRN_DAT_API __declspec(dllexport)
- #else // GRN_DAT_EXPORT
- #define GRN_DAT_API __declspec(dllimport)
- #endif // GRN_DAT_EXPORT
- #else // WIN32
- #define GRN_DAT_API
- #endif // WIN32
+# ifdef WIN32
+# ifdef GRN_DAT_EXPORT
+# define GRN_DAT_API __declspec(dllexport)
+# else // GRN_DAT_EXPORT
+# define GRN_DAT_API __declspec(dllimport)
+# endif // GRN_DAT_EXPORT
+# else // WIN32
+# define GRN_DAT_API
+# endif // WIN32
#endif // GRN_DAT_API
namespace grn {
@@ -239,25 +239,22 @@ typedef Error<SIZE_ERROR> SizeError;
typedef Error<UNEXPECTED_ERROR> UnexpectedError;
typedef Error<STATUS_ERROR> StatusError;
-#define GRN_DAT_INT_TO_STR(value) \
- #value
-#define GRN_DAT_LINE_TO_STR(line) \
- GRN_DAT_INT_TO_STR(line)
-#define GRN_DAT_LINE_STR \
- GRN_DAT_LINE_TO_STR(__LINE__)
+#define GRN_DAT_INT_TO_STR(value) #value
+#define GRN_DAT_LINE_TO_STR(line) GRN_DAT_INT_TO_STR(line)
+#define GRN_DAT_LINE_STR GRN_DAT_LINE_TO_STR(__LINE__)
-#define GRN_DAT_THROW(code, msg) \
- (throw grn::dat::Error<code>(__FILE__, __LINE__, \
- __FILE__ ":" GRN_DAT_LINE_STR ": " #code ": " msg))
-#define GRN_DAT_THROW_IF(code, cond) \
- (void)((!(cond)) || (GRN_DAT_THROW(code, #cond), 0))
+#define GRN_DAT_THROW(code, msg)\
+ (throw grn::dat::Error<code>(__FILE__, __LINE__,\
+ __FILE__ ":" GRN_DAT_LINE_STR ": " #code ": " msg))
+#define GRN_DAT_THROW_IF(code, cond)\
+ (void)((!(cond)) || (GRN_DAT_THROW(code, #cond), 0))
#ifdef _DEBUG
- #define GRN_DAT_DEBUG_THROW_IF(cond) \
- GRN_DAT_THROW_IF(grn::dat::UNEXPECTED_ERROR, cond)
- #define GRN_DAT_DEBUG_LOG(var) \
- (std::clog << __FILE__ ":" GRN_DAT_LINE_STR ": " #var ": " \
- << (var) << std::endl)
+ #define GRN_DAT_DEBUG_THROW_IF(cond)\
+ GRN_DAT_THROW_IF(grn::dat::UNEXPECTED_ERROR, cond)
+ #define GRN_DAT_DEBUG_LOG(var)\
+ (std::clog << __FILE__ ":" GRN_DAT_LINE_STR ": " #var ": "\
+ << (var) << std::endl)
#else // _DEBUG
#define GRN_DAT_DEBUG_THROW_IF(cond)
#define GRN_DAT_DEBUG_LOG(var)
Modified: lib/dat/file-impl.cpp (+3 -3)
===================================================================
--- lib/dat/file-impl.cpp 2012-05-17 10:05:36 +0900 (0903df7)
+++ lib/dat/file-impl.cpp 2012-05-17 10:36:12 +0900 (6382ae9)
@@ -28,9 +28,9 @@
# undef max
# endif // max
#else // WIN32
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
+# include <fcntl.h>
+# include <sys/mman.h>
+# include <unistd.h>
#endif // WIN32
#include <algorithm>
Modified: lib/dat/file-impl.hpp (+1 -1)
===================================================================
--- lib/dat/file-impl.hpp 2012-05-17 10:05:36 +0900 (0cf2a35)
+++ lib/dat/file-impl.hpp 2012-05-17 10:36:12 +0900 (f4e0543)
@@ -19,7 +19,7 @@
#define GRN_DAT_FILE_IMPL_HPP_
#ifdef WIN32
-#include <windows.h>
+# include <windows.h>
#endif // WIN32
#include "dat.hpp"