Skip to content

g++ -> clang++#465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jteresco merged 1 commit into from
Oct 2, 2021
Merged

g++ -> clang++ #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions siteupdate/cplusplus/Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
CXX = clang++
CXXFLAGS = -std=c++11 -Wno-comment -Wno-dangling-else -Wno-logical-op-parentheses

MTObjects = siteupdateMT.o functions/sql_fileMT.o threads/threads.o \
classes/GraphGeneration/HighwayGraphMT.o \
classes/WaypointQuadtree/WaypointQuadtreeMT.o \
Expand DownExpand Up@@ -43,24 +46,36 @@ CommonObjects = \
.PHONY: all clean
all: siteupdate siteupdateST

%MT.d: %.cpp ; g++ -std=c++11 -MM -D threading_enabled $< | sed -r "s~.*:~$*MT.o:~" > $@
%ST.d: %.cpp ; g++ -std=c++11 -MM $< | sed -r "s~.*:~$*ST.o:~" > $@
%.d : %.cpp ; g++ -std=c++11 -MM $< | sed -r "s~.*:~$*.o:~" > $@
%MT.d: %.cpp
@echo $@
@$(CXX) $(CXXFLAGS) -MM -D threading_enabled $< | sed -r "s~.*:~$*MT.o:~" > $@
%ST.d: %.cpp
@echo $@
@$(CXX) $(CXXFLAGS) -MM $< | sed -r "s~.*:~$*ST.o:~" > $@
%.d : %.cpp
@echo $@
@$(CXX) $(CXXFLAGS) -MM $< | sed -r "s~.*:~$*.o:~" > $@

-include $(MTObjects:.o=.d)
-include $(STObjects:.o=.d)
-include $(CommonObjects:.o=.d)

%MT.o: ; g++ -std=c++11 -o $@ -D threading_enabled -c $<
%ST.o: ; g++ -std=c++11 -o $@ -c $<
%.o : ; g++ -std=c++11 -o $@ -c $<
%MT.o:
@echo $@
@$(CXX) $(CXXFLAGS) -o $@ -D threading_enabled -c $<
%ST.o:
@echo $@
@$(CXX) $(CXXFLAGS) -o $@ -c $<
%.o:
@echo $@
@$(CXX) $(CXXFLAGS) -o $@ -c $<

siteupdate: $(MTObjects) $(CommonObjects)
@echo Linking siteupdate...
@g++ -std=c++11 -pthread -o siteupdate $(MTObjects) $(CommonObjects)
@echo $@
@$(CXX) $(CXXFLAGS) -pthread -o siteupdate $(MTObjects) $(CommonObjects)
siteupdateST: $(STObjects) $(CommonObjects)
@echo Linking siteupdateST...
@g++ -std=c++11 -o siteupdateST $(STObjects) $(CommonObjects)
@echo $@
@$(CXX) $(CXXFLAGS) -o siteupdateST $(STObjects) $(CommonObjects)

clean:
@rm -f $(MTObjects) $(STObjects) $(CommonObjects)
Expand Down
2 changes: 1 addition & 1 deletion siteupdate/cplusplus/siteupdate.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -374,7 +374,7 @@ int main(int argc, char *argv[])
#endif
TravelerList::ids.clear();
TravelerList::listupdates.clear();
cout << endl << et.et() << "Processed " << TravelerList::allusers.size() << " traveler list files." << endl;
cout << endl << et.et() << "Processed " << TravelerList::allusers.size() << " traveler list files. Sorting and numbering." << endl;
TravelerList::allusers.sort(sort_travelers_by_name);
// assign traveler numbers for master traveled graph
unsigned int travnum = 0;
Expand Down
2 changes: 1 addition & 1 deletion siteupdate/python-teresco/siteupdate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3119,7 +3119,7 @@ def run(self):
traveler_lists.append(TravelerList(t,update,el,args.userlistfilepath))
del traveler_ids
del listupdates
print('\n' + et.et() + "Processed " + str(len(traveler_lists)) + " traveler list files.")
print('\n' + et.et() + "Processed " + str(len(traveler_lists)) + " traveler list files. Sorting and numbering.")
traveler_lists.sort(key=lambda TravelerList: TravelerList.traveler_name)
# assign traveler numbers
travnum = 0
Expand Down