diff --git a/.vscode/settings.json b/.vscode/settings.json index 93e840f..da4fa67 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,9 @@ { "files.autoSave": "onFocusChange", - "editor.fontSize": 15, - "editor.fontFamily": "'Zpix', 'Courier New', monospace", + "editor.fontSize": 14, + "editor.fontFamily": "'Source Code Pro', 'Courier New', monospace", + "terminal.integrated.fontFamily": "Source Code Pro", + "editor.fontLigatures": true, "cmake.configureOnOpen": true, "cmake.debugConfig": { "console": "integratedTerminal", @@ -16,11 +18,10 @@ "ignoreFailures": true } ], - "args": [ - ] + "visualizerFile": "${workspaceRoot}/.vscode/qt5.natvis" }, - "cmake.configureSettings": { - //"CMAKE_TOOLCHAIN_FILE": "${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + "cmake.environment": { + "PATH": "${env:PATH};" }, "cmake.options.statusBarVisibility": "visible", "cmake.generator": "Ninja", @@ -32,17 +33,19 @@ "zh-hant": true, "zh-hans": true }, + "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", "files.associations": { - "memory": "cpp", "xstring": "cpp", + "vector": "cpp", + "string": "cpp", "algorithm": "cpp", "any": "cpp", "array": "cpp", "atomic": "cpp", "bitset": "cpp", "cctype": "cpp", - "charconv": "cpp", "chrono": "cpp", + "cinttypes": "cpp", "clocale": "cpp", "cmath": "cpp", "codecvt": "cpp", @@ -57,9 +60,11 @@ "cstring": "cpp", "ctime": "cpp", "cwchar": "cpp", + "cwctype": "cpp", "deque": "cpp", "exception": "cpp", "filesystem": "cpp", + "forward_list": "cpp", "fstream": "cpp", "functional": "cpp", "future": "cpp", @@ -74,27 +79,32 @@ "list": "cpp", "locale": "cpp", "map": "cpp", + "memory": "cpp", "mutex": "cpp", "new": "cpp", + "numeric": "cpp", "optional": "cpp", "ostream": "cpp", + "queue": "cpp", + "random": "cpp", "ratio": "cpp", + "set": "cpp", "shared_mutex": "cpp", "sstream": "cpp", "stdexcept": "cpp", "streambuf": "cpp", - "string": "cpp", "string_view": "cpp", + "strstream": "cpp", "system_error": "cpp", - "xthread": "cpp", "thread": "cpp", "tuple": "cpp", "type_traits": "cpp", + "typeindex": "cpp", "typeinfo": "cpp", "unordered_map": "cpp", "utility": "cpp", + "valarray": "cpp", "variant": "cpp", - "vector": "cpp", "xfacet": "cpp", "xhash": "cpp", "xiosbase": "cpp", @@ -111,27 +121,19 @@ "xtr1common": "cpp", "xtree": "cpp", "xutility": "cpp", + "qbytearray": "cpp", + "*.ipp": "cpp", + "xthread": "cpp", + "*.tcc": "cpp", + "regex": "cpp", "bit": "cpp", + "memory_resource": "cpp", + "source_location": "cpp", + "charconv": "cpp", "compare": "cpp", "concepts": "cpp", "coroutine": "cpp", - "expected": "cpp", "format": "cpp", - "forward_list": "cpp", - "source_location": "cpp", - "span": "cpp", - "stop_token": "cpp", - "*.ipp": "cpp", - "queue": "cpp", - "resumable": "cpp", - "numeric": "cpp", - "set": "cpp", - "*.tcc": "cpp", - "cwctype": "cpp", - "memory_resource": "cpp", - "random": "cpp", - "cinttypes": "cpp", - "regex": "cpp" - }, - "makefile.configureOnOpen": false + "stop_token": "cpp" + } } \ No newline at end of file diff --git a/Makefile b/Makefile index c2bca29..24d09a0 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ # # ***************************** XP make SCRIPT ******************************** # -# XP USE, Test On Windows XP SP3 under mingw730_32 with boost1.81 filesystem +# XP USE, Test On Windows XP SP3 under mingw730_32 with boost1.83 filesystem # boost compile arg: b2.exe link=static runtime-link=shared --with-filesystem --prefix=C:\boost install export PATH := C:\mingw32\bin:$(PATH) +BOOST_VER = 1_83 CXX = g++ CXXFLAGSA = -O2 -Wall -DUSE_BOOST_FILESYSTEM -std=c++17 -I./ -I./3rd -I./net -I./ofen/include -I./util -CXXFLAGSB = -IC:\boost\include\boost-1_81 -Wno-unused-variable +CXXFLAGSB = -IC:\boost\include\boost-$(BOOST_VER) -Wno-unused-variable # 目录 CURDIR_WINDOWS := $(subst /,\,$(CURDIR)) OBJDIR = $(CURDIR_WINDOWS)\build\obj @@ -14,7 +15,7 @@ BINDIR = $(CURDIR_WINDOWS)\build\bin LIBDIR = $(CURDIR_WINDOWS)\build\lib # 库路径和库文件 LIB_PATHS = -L$(LIBDIR) -LC:\boost\lib -LIBS = -lws2_32 -lwsock32 -lboost_filesystem-mgw7-mt-x32-1_81 +LIBS = -lws2_32 -lwsock32 -lboost_filesystem-mgw7-mt-x32-$(BOOST_VER) # 源文件 UTIL_SRC = $(wildcard util/*.cpp) NET_SRC = $(wildcard net/*.cpp) diff --git a/client/client.cpp b/client/client.cpp index 438e62c..3a8b6cd 100644 --- a/client/client.cpp +++ b/client/client.cpp @@ -537,6 +537,9 @@ void CClient::handle_frame(CFrameBuffer* buf) logger_->error("Send Failed {}.", __LINE__); break; } + if (buf->type_ == TYPE_UNCONFIRM_UPDATE_LIST) { + break; + } list_serve_id_ = buf->tid_; logger_->debug("Do Task From {}.", buf->tid_); if (update_list_th_.joinable()) {