Removed kludgy -Dprotected=public flags in testing.

gmarcais · Jul 2, 2015 · a3c491a · a3c491a
1 parent e99151a
commit a3c491a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -203,7 +203,7 @@ bin_test_all_SOURCES = unit_tests/test_main.cc				\
 	               unit_tests/test_stdio_filebuf.cc
 bin_test_all_SOURCES += jellyfish/backtrace.cc
 
-bin_test_all_CPPFLAGS = -Dprotected=public -Dprivate=public -DJSON_IS_AMALGAMATION=1
+bin_test_all_CPPFLAGS = -DJSON_IS_AMALGAMATION=1
 bin_test_all_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir)/unit_tests/gtest/include -I$(srcdir)/unit_tests -I$(srcdir)/include
 bin_test_all_LDADD = libgtest.la $(LDADD)
 YAGGO_SOURCES += unit_tests/test_main_cmdline.hpp

diff --git a/unit_tests/test_mer_heap.cc b/unit_tests/test_mer_heap.cc
@@ -16,7 +16,7 @@ static const uint16_t mer_len  = 50;
 static const size_t   nb_mers  = ary_size / 2;
 
 class MerHeapTest : public ::testing::TestWithParam<size_t> {
-protected:
+public:
   static void SetUpTestCase() {
     mer_dna::k(mer_len);
     shared_ary = new large_array(ary_size, mer_len * 2, 0, 63);