no message
parent
22ad0c7c81
commit
a3dae0af2b
|
|
@ -1,26 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="BranchesTreeState">
|
||||
<expand>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</component>
|
||||
<component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true">
|
||||
<generated>
|
||||
<config projectName="General" targetName="General" />
|
||||
<config projectName="generallib" targetName="generallib" />
|
||||
<config projectName="generallib" targetName="General" />
|
||||
</generated>
|
||||
</component>
|
||||
<component name="CMakeSettings" AUTO_RELOAD="true">
|
||||
|
|
@ -30,9 +13,15 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="0facce0d-c642-4d80-b2fb-daf5f3e68dff" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/general/src/algorithm/ringbuffer.hpp" beforeDir="false" afterPath="$PROJECT_DIR$/general/src/algorithm/ringbuffer.hpp" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
|
|
@ -53,6 +42,9 @@
|
|||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" />
|
||||
<component name="OCResolveContextSettings">
|
||||
<option name="configuration" value="0-generallib" />
|
||||
</component>
|
||||
<component name="ProjectId" id="1UhntPy4Y6cJ81thpskTMk9Asng" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectViewState">
|
||||
|
|
@ -75,22 +67,40 @@
|
|||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="settings.editor.selected.configurable" value="CPPToolchains" />
|
||||
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="D:\project\c++\generallib\test\src\tcptest" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="D:\project\c++\generallib\src\encrypt" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration name="General" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="General" TARGET_NAME="General" CONFIG_NAME="Debug">
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
<list>
|
||||
<RuleState>
|
||||
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
||||
</RuleState>
|
||||
<RuleState>
|
||||
<option name="name" value="StatusDashboardGroupingRule" />
|
||||
</RuleState>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="CMake Application.General">
|
||||
<configuration name="General" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" PROJECT_NAME="generallib" TARGET_NAME="General" CONFIG_NAME="Debug">
|
||||
<method v="2">
|
||||
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="generallib" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" PROJECT_NAME="generallib" TARGET_NAME="generallib" CONFIG_NAME="Debug">
|
||||
<method v="2">
|
||||
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="CMake Application.generallib" />
|
||||
<item itemvalue="CMake Application.General" />
|
||||
</list>
|
||||
</component>
|
||||
<component name="SvnConfiguration">
|
||||
<configuration />
|
||||
|
|
@ -144,26 +154,33 @@
|
|||
<workItem from="1588607501663" duration="599000" />
|
||||
<workItem from="1588685364145" duration="2436000" />
|
||||
<workItem from="1588731711427" duration="7486000" />
|
||||
<workItem from="1588756178008" duration="3364000" />
|
||||
<workItem from="1588988345219" duration="6326000" />
|
||||
<workItem from="1589364212338" duration="2663000" />
|
||||
<workItem from="1588756178008" duration="9322000" />
|
||||
<workItem from="1588780515188" duration="1174000" />
|
||||
<workItem from="1588781713713" duration="809000" />
|
||||
<workItem from="1588924890957" duration="190000" />
|
||||
<workItem from="1588937000080" duration="6169000" />
|
||||
<workItem from="1589005894180" duration="10282000" />
|
||||
<workItem from="1589079851627" duration="4745000" />
|
||||
<workItem from="1589096335715" duration="9622000" />
|
||||
<workItem from="1589465397742" duration="4077000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="2" />
|
||||
<option name="version" value="1" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State />
|
||||
<State>
|
||||
<option name="COLUMN_ORDER" />
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="651" y="314" width="409" height="388" key="#Notifications" timestamp="1588741195489">
|
||||
|
|
@ -178,33 +195,9 @@
|
|||
<screen x="0" y="40" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="549" y="206" key="FileChooserDialogImpl/0.40.1536.824@0.40.1536.824" timestamp="1588739069638" />
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.bottom" timestamp="1589037862487">
|
||||
<screen x="0" y="40" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.bottom/0.40.1536.824/-1694.-1040.2560.1040@0.40.1536.824" timestamp="1589037862487" />
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.bottom/0.40.1536.824@0.40.1536.824" timestamp="1588993827572" />
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.center" timestamp="1589037862487">
|
||||
<screen x="0" y="40" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.center/0.40.1536.824/-1694.-1040.2560.1040@0.40.1536.824" timestamp="1589037862487" />
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.center/0.40.1536.824@0.40.1536.824" timestamp="1588993827572" />
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.left" timestamp="1589037862487">
|
||||
<screen x="0" y="40" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.left/0.40.1536.824/-1694.-1040.2560.1040@0.40.1536.824" timestamp="1589037862487" />
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.left/0.40.1536.824@0.40.1536.824" timestamp="1588993827572" />
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.right" timestamp="1589037862487">
|
||||
<screen x="0" y="40" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.right/0.40.1536.824/-1694.-1040.2560.1040@0.40.1536.824" timestamp="1589037862487" />
|
||||
<state width="1493" height="210" key="GridCell.Tab.0.right/0.40.1536.824@0.40.1536.824" timestamp="1588993827572" />
|
||||
<state x="270" y="96" key="SettingsEditor" timestamp="1588739395688">
|
||||
<screen x="0" y="40" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="270" y="96" key="SettingsEditor/0.40.1536.824@0.40.1536.824" timestamp="1588739395688" />
|
||||
<state x="431" y="185" width="672" height="678" key="search.everywhere.popup" timestamp="1589365807287">
|
||||
<screen x="0" y="40" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="431" y="185" width="672" height="678" key="search.everywhere.popup/0.40.1536.824@0.40.1536.824" timestamp="1589365807287" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -35,7 +35,7 @@ public:
|
|||
{
|
||||
int copy_sz = min(count, this->ReadableCnt());
|
||||
memcpy(data, mHead, copy_sz * sizeof(T));
|
||||
mHead += copy_sz * sizeof(T);
|
||||
mHead += copy_sz;
|
||||
return copy_sz;
|
||||
}
|
||||
else // 头部大于尾部
|
||||
|
|
@ -53,7 +53,7 @@ public:
|
|||
int copy_sz = mLen - (mHead - mBuffer);
|
||||
memcpy(data, mHead, copy_sz * sizeof(T));
|
||||
mHead = mBuffer;
|
||||
copy_sz += Read( (char*)data + copy_sz*sizeof(T), count - copy_sz);
|
||||
copy_sz += Read( (T*)data + copy_sz*sizeof(T), count - copy_sz);
|
||||
return copy_sz;
|
||||
}
|
||||
}
|
||||
|
|
@ -83,7 +83,7 @@ public:
|
|||
{
|
||||
memcpy(mTail, in, len*sizeof(T)); // 头部大于尾部
|
||||
mTail += len;
|
||||
return count;
|
||||
return len;
|
||||
}
|
||||
}
|
||||
private:
|
||||
|
|
|
|||
Loading…
Reference in New Issue