Skip to content
This repository has been archived by the owner on Oct 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1 from ammitra/feature-STD_UNORDERED_MAP
Browse files Browse the repository at this point in the history
Feature std unordered map
  • Loading branch information
dgastler authored Jun 3, 2021
2 parents 848d5c3 + 23717b2 commit 552a31e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,16 @@ LIBRARIES = -lcurses \

INSTALL_PATH ?= ./install


INSTALL_PATH ?= ./install

CXX_FLAGS = -std=c++11 -g -O3 -rdynamic -Wall -MMD -MP -fPIC ${INCLUDE_PATH} -Werror -Wno-literal-suffix

CXX_FLAGS +=-fno-omit-frame-pointer -Wno-ignored-qualifiers -Werror=return-type -Wextra -Wno-long-long -Winit-self -Wno-unused-local-typedefs -Woverloaded-virtual ${COMPILETIME_ROOT} ${FALLTHROUGH_FLAGS}

ifdef MAP_TYPE
CXX_FLAGS += ${MAP_TYPE}
endif

LINK_LIBRARY_FLAGS = -shared -fPIC -Wall -g -O3 -rdynamic ${LIBRARY_PATH} ${LIBRARIES} -Wl,-rpath=$(RUNTIME_LDPATH)/lib ${COMPILETIME_ROOT}

LINK_EXE_FLAGS = -Wall -g -O3 -rdynamic ${LIBRARY_PATH} ${LIBRARIES} \
Expand Down Expand Up @@ -151,5 +155,12 @@ bin/% : obj/standalone/%.o
${CXX} ${LINK_EXE_FLAGS} ${UHAL_LIBRARY_FLAGS} ${UHAL_LIBRARIES} -lBUTool_GenericIPBus -lboost_system -lpugixml ${EXE_GENERIC_IPBUS_STANDALONE_OBJECT_FILES} $^ -o $@


# -------------------
# Install
# -------------------
install: all
install -m 775 -d ${INSTALL_PATH}/lib
install -b -m 775 ./lib/* ${INSTALL_PATH}/lib

-include $(LIBRARY_OBJECT_FILES:.o=.d)

4 changes: 3 additions & 1 deletion src/GenericIPBus_device/GenericIPBus_device.cc
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ void GenericIPBusDevice::LoadCommandList(){

CommandReturn::status GenericIPBusDevice::DumpDebug(std::vector<std::string> /*strArg*/,
std::vector<uint64_t> /*intArg*/){
/*
std::stringstream outfileName;
outfileName << "Apollo_debug_dump_";
Expand All @@ -117,6 +118,7 @@ CommandReturn::status GenericIPBusDevice::DumpDebug(std::vector<std::string> /*s
std::ofstream outfile(outfileName.str().c_str(),std::ofstream::out);
outfile << outfileName.str() << std::endl;
SM->DebugDump(outfile);
outfile.close();
outfile.close();
*/
return CommandReturn::OK;
}

0 comments on commit 552a31e

Please sign in to comment.