Attachment #451824 for bug #598424

View | Details | Raw Unified | Return to bug 598424
Collapse All | Expand All

Lines 108-114 CFLAGS?=@CFLAGS@ Link Here

(-)a/Makefile.in (-1 / +1 lines)
108	CFLAGS+=-Wall	108	CFLAGS+=-Wall
109	CFLAGS+=@LFS_FLAGS@	109	CFLAGS+=@LFS_FLAGS@
110	CXXFLAGS?=@CXXFLAGS@	110	CXXFLAGS?=@CXXFLAGS@
111	CXXFLAGS+=-Wall -fno-strict-aliasing -std=gnu++98	111	CXXFLAGS+=-Wall -fno-strict-aliasing
112	CXXFLAGS+=@CXXOPTIMISE_FLAG@	112	CXXFLAGS+=@CXXOPTIMISE_FLAG@
113	CXXFLAGS+=@CXXDEBUG_FLAG@	113	CXXFLAGS+=@CXXDEBUG_FLAG@
114	CXXFLAGS+=@CXX_STRERROR_FLAG@	114	CXXFLAGS+=@CXX_STRERROR_FLAG@

Lines 142-148 namespace { Link Here

(-)a/thin-provisioning/restore_emitter.cc (-1 / +1 lines)
142	bool device_exists(thin_dev_t dev) const {	142	bool device_exists(thin_dev_t dev) const {
143	uint64_t key[1] = {dev};	143	uint64_t key[1] = {dev};
144	device_tree::maybe_value v = md_->details_->lookup(key);	144	device_tree::maybe_value v = md_->details_->lookup(key);
145	return v;	145	return v.is_initialized();
146	}	146	}
147		147
148	metadata::ptr md_;	148	metadata::ptr md_;

Lines 232-238 bool Link Here

(-)a/thin-provisioning/thin_pool.cc (-1 / +1 lines)
232	thin_pool::device_exists(thin_dev_t dev) const	232	thin_pool::device_exists(thin_dev_t dev) const
233	{	233	{
234	uint64_t key[1] = {dev};	234	uint64_t key[1] = {dev};
235	return md_->details_->lookup(key);	235	return md_->details_->lookup(key).is_initialized();
236	}	236	}
237		237
238	//----------------------------------------------------------------	238	//----------------------------------------------------------------

Lines 25-31 GMOCK_FLAGS=\ Link Here

(-)a/unit-tests/Makefile.in (-2 / +2 lines)
25	-Wno-unused-local-typedefs	25	-Wno-unused-local-typedefs
26		26
27	GMOCK_LIBS=\	27	GMOCK_LIBS=\
28	-Llib -lpdata -lgmock -lpthread -laio	28	-Llib -lpdata -lgmock -lpthread -laio -lgtest
29		29
30	GMOCK_DEPS=\	30	GMOCK_DEPS=\
31	$(wildcard $(GMOCK_DIR)/include/*.h) \	31	$(wildcard $(GMOCK_DIR)/include/*.h) \
Lines 80-86 TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOU Link Here
80	sed 's,$[^ :]$\.o[ :],\1.o \1.gmo $* : Makefile ,g' < $.$$$$ > $.d; \	80	sed 's,$[^ :]$\.o[ :],\1.o \1.gmo $* : Makefile ,g' < $.$$$$ > $.d; \
81	$(RM) $*.$$$$	81	$(RM) $*.$$$$
82		82
83	unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a	83	unit-tests/unit_tests: $(TEST_OBJECTS) lib/libpdata.a
84	@echo " [LD] $<"	84	@echo " [LD] $<"
85	$(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)	85	$(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
86		86

Return to bug 598424