Code Clean Up (#37)

* removing binary dependcy from odbc project * removing extra warnings * removing build warning, removing network project * removing dummy test * creating new define to handle ignite_error_macros
aws · Mar 4, 2022 · d86e53a · d86e53a
1 parent ca9165c
commit d86e53a
Show file tree

Hide file tree

Showing 41 changed files with 35 additions and 3,846 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -84,7 +84,6 @@ add_subdirectory(binary)
 
 if (${WITH_CORE} OR ${WITH_TESTS})
     add_subdirectory(core)
-    add_subdirectory(ignite)
 endif()
 
 if (${WITH_TESTS})
@@ -99,10 +98,6 @@ if (${WITH_TESTS})
     endif()
 endif()
 
-if (${WITH_ODBC})
-    add_subdirectory(network)
-endif()
-
 if (${WITH_ODBC})
     add_subdirectory(odbc)
 

diff --git a/src/binary/include/ignite/binary/binary_type.h b/src/binary/include/ignite/binary/binary_type.h
@@ -30,6 +30,9 @@
 
 #include <ignite/impl/binary/binary_type_impl.h>
 
+
+#ifndef _IGNITE_BINARY_TYPE_MACRO
+#define _IGNITE_BINARY_TYPE_MACRO
 /**
  * @def IGNITE_BINARY_TYPE_START(T)
  * Start binary type definition.
@@ -126,7 +129,7 @@ static void GetNull(T& dst) \
     dst = 0; \
 }
 
-
+#endif // _IGNITE_BINARY_TYPE_MACRO
 namespace ignite
 {
     namespace binary

diff --git a/src/common/include/ignite/ignite_error.h b/src/common/include/ignite/ignite_error.h
@@ -30,6 +30,10 @@
 
 #include <ignite/common/common.h>
 
+//Define can be removed once the duplicated code was removed
+#ifndef _IGNITE_ERROR_MACRO
+#define _IGNITE_ERROR_MACRO
+
 #define IGNITE_ERROR_1(code, part1) { \
     std::stringstream stream; \
     stream << (part1); \
@@ -72,6 +76,8 @@
     throw ignite::IgniteError(code, stream.str().c_str()); \
 }
 
+#endif //_IGNITE_ERROR_MACRO
+
 #ifdef _MSC_VER
 #   pragma warning(push)
 #   pragma warning(disable : 4275)

diff --git a/src/common/os/win/include/ignite/common/common.h b/src/common/os/win/include/ignite/common/common.h
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef _IGNITE_COMMON_COMMON
-#define _IGNITE_COMMON_COMMON
+#ifndef _IGNITE_ODBC_COMMON_COMMON
+#define _IGNITE_ODBC_COMMON_COMMON
 
 #define IGNITE_EXPORT __declspec(dllexport)
 #define IGNITE_IMPORT __declspec(dllimport)
@@ -43,4 +43,4 @@
 
 #define IGNITE_UNUSED(x) ((void) x)
 
-#endif //_IGNITE_COMMON_COMMON
+#endif //_IGNITE_ODBC_COMMON_COMMON
diff --git a/src/ignite/CMakeLists.txt b/src/ignite/CMakeLists.txt
diff --git a/src/ignite/src/ignite.cpp b/src/ignite/src/ignite.cpp