all broken
This commit is contained in:
6
Makefile
6
Makefile
@@ -38,9 +38,9 @@ CC = c++
|
||||
EXT = cpp
|
||||
|
||||
CFLAGS = -Wall -Wextra -Werror $(INCLUDES)
|
||||
#CFLAGS += -std=c++98
|
||||
#CFLAGS += -MMD -MP #see end-page note on header dependencie
|
||||
#CFLAGS += -g3
|
||||
CFLAGS += -std=c++98
|
||||
CFLAGS += -MMD -MP #see end-page note on header dependencie
|
||||
CFLAGS += -g3
|
||||
|
||||
CFLAGS_STL = $(CFLAGS)
|
||||
CFLAGS_STL += -D STL
|
||||
|
||||
@@ -20,13 +20,14 @@
|
||||
|
||||
// defines
|
||||
// ****************************************
|
||||
# define TITLE(s) std::cout << "\n" B_PURPLE #s RESET "\n\n";
|
||||
# define VAL(n) val<T>(n)
|
||||
# define VALT(n) val<T>(n)
|
||||
# define VALU(n) val<U>(n)
|
||||
# define TOI(n) toi<T>(n)
|
||||
# define PRINT(n) print<>(n, #n);
|
||||
# define DELETE delete_structs();
|
||||
# define TITLE(s) std::cout << "\n" B_PURPLE #s RESET "\n\n";
|
||||
# define VAL(n) val<T>(n)
|
||||
# define VALT(n) val<T>(n)
|
||||
# define VALU(n) val<U>(n)
|
||||
# define TOI(n) toi<T>(n)
|
||||
# define PRINT(n) print<>(n, #n);
|
||||
# define DELETE delete_structs();
|
||||
# define DISALLOW_MYSTRUCT allow_mystruct = 0;
|
||||
|
||||
|
||||
// prototypes
|
||||
@@ -43,7 +44,7 @@ extern std::vector< mystruct* > mem_list;
|
||||
|
||||
// adding each test to the list
|
||||
// ***************************
|
||||
#define TEST(f_name) TEST_V(f_name)
|
||||
#define TEST_S(f_name) TEST_V(f_name)
|
||||
|
||||
/*
|
||||
*/
|
||||
@@ -56,7 +57,9 @@ extern std::vector< mystruct* > mem_list;
|
||||
add_to_list(#f_name, "int", new(s_ ## f_name <int>));\
|
||||
add_to_list(#f_name, "char", new(s_ ## f_name <char>));\
|
||||
add_to_list(#f_name, "std::string", new(s_ ## f_name <std::string>));\
|
||||
add_to_list(#f_name, "mystruct*", new(s_ ## f_name <mystruct*>));\
|
||||
if (allow_mystruct)\
|
||||
add_to_list(#f_name, "mystruct*", new(s_ ## f_name <mystruct*>));\
|
||||
allow_mystruct = 1;\
|
||||
}\
|
||||
template <class T>\
|
||||
void s_ ## f_name <T>::func()
|
||||
|
||||
@@ -14,6 +14,11 @@
|
||||
#endif
|
||||
|
||||
|
||||
// global variables
|
||||
// ****************************************
|
||||
int allow_mystruct = 1;
|
||||
|
||||
|
||||
// templates print
|
||||
// *****************************************
|
||||
template <class T>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#define DEQ_VEC vector
|
||||
#endif
|
||||
|
||||
TEST(tests_stack_constructor)
|
||||
TEST_S(tests_stack_constructor)
|
||||
{
|
||||
// title
|
||||
TITLE(simple test)
|
||||
@@ -34,7 +34,7 @@ TEST(tests_stack_constructor)
|
||||
DELETE
|
||||
}
|
||||
|
||||
TEST(tests_stack_empty)
|
||||
TEST_S(tests_stack_empty)
|
||||
{
|
||||
// title
|
||||
TITLE(simple test)
|
||||
@@ -57,7 +57,7 @@ TEST(tests_stack_empty)
|
||||
DELETE
|
||||
}
|
||||
|
||||
TEST(tests_stack_size)
|
||||
TEST_S(tests_stack_size)
|
||||
{
|
||||
// title
|
||||
TITLE(simple test)
|
||||
@@ -76,7 +76,7 @@ TEST(tests_stack_size)
|
||||
DELETE
|
||||
}
|
||||
|
||||
TEST(tests_stack_top)
|
||||
TEST_S(tests_stack_top)
|
||||
{
|
||||
// title
|
||||
TITLE(simple test)
|
||||
@@ -100,7 +100,7 @@ TEST(tests_stack_top)
|
||||
DELETE
|
||||
}
|
||||
|
||||
TEST(tests_stack_push)
|
||||
TEST_S(tests_stack_push)
|
||||
{
|
||||
// title
|
||||
TITLE(simple test)
|
||||
@@ -114,7 +114,7 @@ TEST(tests_stack_push)
|
||||
DELETE
|
||||
}
|
||||
|
||||
TEST(tests_stack_pop)
|
||||
TEST_S(tests_stack_pop)
|
||||
{
|
||||
// title
|
||||
TITLE(simple test)
|
||||
|
||||
@@ -695,6 +695,7 @@ TEST_V(tests_vector_get_allocator)
|
||||
DELETE
|
||||
}
|
||||
|
||||
//DISALLOW_MYSTRUCT
|
||||
TEST_V(tests_vector_relational_operators)
|
||||
{
|
||||
// title
|
||||
|
||||
Reference in New Issue
Block a user