diff --git a/Makefile b/Makefile index c1387ec..e2e9175 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ export MAKEFLAGS += --silent -r -j export flags=-std=c++17 -Wall -Wno-main -Wno-trigraphs -Wno-missing-braces -Wno-stringop-overflow -DPROFILE_$(profile) -fdiagnostics-color=always export ldflags=-L$(bin)/$(profile) -Wl,-rpath=bin/$(profile) -export lib=ppc$(version-major)- +export lib=ppc-$(version-major).$(version-minor)- export profile=release ############# SETTINGS ############ @@ -45,7 +45,7 @@ export CC=gcc export CXX=g++ # export version-build=$(if $(wildcard build.version),$(shell type build.version),0) -export binary = $(bin)/$(output)$(version-major)-windows.exe +export binary = $(bin)/$(output)-$(version-major).$(version-minor)-windows.exe build: version echo ======================== Compiling ========================= @@ -75,7 +75,7 @@ export rmdir=rm -rf $$1 export echo=echo "$$1" export so=.so # export version-build=$(if $(wildcard build.version),$(shell cat build.version),0) -export binary = $(bin)/$(output)$(version-major)-linux +export binary = $(bin)/$(output)-$(version-major).$(version-minor)-linux build: version echo ======================== Compiling ========================= diff --git a/include/lang/common.hh b/include/lang/common.hh index c81a5c5..ed937aa 100644 --- a/include/lang/common.hh +++ b/include/lang/common.hh @@ -65,7 +65,7 @@ namespace ppc::lang { nmsp_t strip_location() const; std::string to_string() const; - operator nmsp_t() { return strip_location(); } + operator nmsp_t() const { return strip_location(); } operator std::string() const { return to_string(); } loc_nmsp_t() { } @@ -76,8 +76,8 @@ namespace ppc::lang { bool resolve_name(const SetT &defs, const nmsp_t &src, const nmsp_t &target) { if (src == target) return true; - for (const auto &it : defs) { - nmsp_t val = (const nmsp_t&)(it); + for (auto it : defs) { + nmsp_t val = (nmsp_t)(it); val.insert(val.end(), src.begin(), src.end()); if (val == target) return true;