Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code Clean Up #37

Merged
merged 6 commits into from
Mar 4, 2022
Merged

Code Clean Up #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e20fd4e
removing binary dependcy from odbc project
affonsov Mar 3, 2022
fa1b9c9
removing extra warnings
affonsov Mar 3, 2022
07ca8ea
removing build warning, removing network project
affonsov Mar 3, 2022
9784585
removing dummy test
affonsov Mar 3, 2022
4a4ed76
creating new define to handle ignite_error_macros
affonsov Mar 4, 2022
390560a
removing warnings
affonsov Mar 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ add_subdirectory(binary)

if (${WITH_CORE} OR ${WITH_TESTS})
add_subdirectory(core)
add_subdirectory(ignite)
endif()

if (${WITH_TESTS})
Expand All @@ -99,10 +98,6 @@ if (${WITH_TESTS})
endif()
endif()

if (${WITH_ODBC})
add_subdirectory(network)
endif()

if (${WITH_ODBC})
add_subdirectory(odbc)

Expand Down
5 changes: 4 additions & 1 deletion src/binary/include/ignite/binary/binary_type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -126,7 +129,7 @@ static void GetNull(T& dst) \
dst = 0; \
}


#endif // _IGNITE_BINARY_TYPE_MACRO
namespace ignite
{
namespace binary
Expand Down
6 changes: 6 additions & 0 deletions src/common/include/ignite/ignite_error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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); \
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/common/os/win/include/ignite/common/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
birschick-bq marked this conversation as resolved.
Show resolved Hide resolved
#define _IGNITE_ODBC_COMMON_COMMON

#define IGNITE_EXPORT __declspec(dllexport)
#define IGNITE_IMPORT __declspec(dllimport)
Expand Down Expand Up @@ -43,4 +43,4 @@

#define IGNITE_UNUSED(x) ((void) x)

#endif //_IGNITE_COMMON_COMMON
#endif //_IGNITE_ODBC_COMMON_COMMON
32 changes: 0 additions & 32 deletions src/ignite/CMakeLists.txt
View file
Open in desktop

This file was deleted.

224 changes: 0 additions & 224 deletions src/ignite/src/ignite.cpp
View file
Open in desktop

This file was deleted.

Loading