diff --git a/teammerger/.vs/teammerger/v16/.suo b/teammerger/.vs/teammerger/v16/.suo new file mode 100644 index 0000000..a1bd343 Binary files /dev/null and b/teammerger/.vs/teammerger/v16/.suo differ diff --git a/teammerger/.vs/teammerger/v16/Browse.VC.db b/teammerger/.vs/teammerger/v16/Browse.VC.db new file mode 100644 index 0000000..49652a0 Binary files /dev/null and b/teammerger/.vs/teammerger/v16/Browse.VC.db differ diff --git a/teammerger/.vs/teammerger/v16/ipch/AutoPCH/2eca2b8263599408/D.ipch b/teammerger/.vs/teammerger/v16/ipch/AutoPCH/2eca2b8263599408/D.ipch new file mode 100644 index 0000000..10d23c6 Binary files /dev/null and b/teammerger/.vs/teammerger/v16/ipch/AutoPCH/2eca2b8263599408/D.ipch differ diff --git a/teammerger/.vs/teammerger/v16/ipch/AutoPCH/50358754ae4e0aea/A.ipch b/teammerger/.vs/teammerger/v16/ipch/AutoPCH/50358754ae4e0aea/A.ipch new file mode 100644 index 0000000..a4a226d Binary files /dev/null and b/teammerger/.vs/teammerger/v16/ipch/AutoPCH/50358754ae4e0aea/A.ipch differ diff --git a/teammerger/.vs/teammerger/v16/ipch/AutoPCH/b0cf379fc99f0a9f/MERGER.ipch b/teammerger/.vs/teammerger/v16/ipch/AutoPCH/b0cf379fc99f0a9f/MERGER.ipch new file mode 100644 index 0000000..6640b32 Binary files /dev/null and b/teammerger/.vs/teammerger/v16/ipch/AutoPCH/b0cf379fc99f0a9f/MERGER.ipch differ diff --git a/teammerger/Debug/merger.obj b/teammerger/Debug/merger.obj new file mode 100644 index 0000000..e0e6b15 Binary files /dev/null and b/teammerger/Debug/merger.obj differ diff --git a/teammerger/Debug/teammerger.exe b/teammerger/Debug/teammerger.exe new file mode 100644 index 0000000..cbd62b5 Binary files /dev/null and b/teammerger/Debug/teammerger.exe differ diff --git a/teammerger/Debug/teammerger.ilk b/teammerger/Debug/teammerger.ilk new file mode 100644 index 0000000..434a24f Binary files /dev/null and b/teammerger/Debug/teammerger.ilk differ diff --git a/teammerger/Debug/teammerger.log b/teammerger/Debug/teammerger.log new file mode 100644 index 0000000..15a50db --- /dev/null +++ b/teammerger/Debug/teammerger.log @@ -0,0 +1,3 @@ + merger.cpp +D:\VSC++\C++wen jian\teammerger\c.h(34): warning C4715: “compute”: 不是所有的控件路径都返回值 + teammerger.vcxproj -> D:\VSC++\C++wen jian\teammerger\Debug\teammerger.exe diff --git a/teammerger/Debug/teammerger.pdb b/teammerger/Debug/teammerger.pdb new file mode 100644 index 0000000..e975192 Binary files /dev/null and b/teammerger/Debug/teammerger.pdb differ diff --git a/teammerger/Debug/teammerger.tlog/CL.command.1.tlog b/teammerger/Debug/teammerger.tlog/CL.command.1.tlog new file mode 100644 index 0000000..17837ca Binary files /dev/null and b/teammerger/Debug/teammerger.tlog/CL.command.1.tlog differ diff --git a/teammerger/Debug/teammerger.tlog/CL.read.1.tlog b/teammerger/Debug/teammerger.tlog/CL.read.1.tlog new file mode 100644 index 0000000..2c8e755 Binary files /dev/null and b/teammerger/Debug/teammerger.tlog/CL.read.1.tlog differ diff --git a/teammerger/Debug/teammerger.tlog/CL.write.1.tlog b/teammerger/Debug/teammerger.tlog/CL.write.1.tlog new file mode 100644 index 0000000..9831912 Binary files /dev/null and b/teammerger/Debug/teammerger.tlog/CL.write.1.tlog differ diff --git a/teammerger/Debug/teammerger.tlog/link.command.1.tlog b/teammerger/Debug/teammerger.tlog/link.command.1.tlog new file mode 100644 index 0000000..dbebda7 Binary files /dev/null and b/teammerger/Debug/teammerger.tlog/link.command.1.tlog differ diff --git a/teammerger/Debug/teammerger.tlog/link.read.1.tlog b/teammerger/Debug/teammerger.tlog/link.read.1.tlog new file mode 100644 index 0000000..3280621 Binary files /dev/null and b/teammerger/Debug/teammerger.tlog/link.read.1.tlog differ diff --git a/teammerger/Debug/teammerger.tlog/link.write.1.tlog b/teammerger/Debug/teammerger.tlog/link.write.1.tlog new file mode 100644 index 0000000..d28f77c Binary files /dev/null and b/teammerger/Debug/teammerger.tlog/link.write.1.tlog differ diff --git a/teammerger/Debug/teammerger.tlog/teammerger.lastbuildstate b/teammerger/Debug/teammerger.tlog/teammerger.lastbuildstate new file mode 100644 index 0000000..f040000 --- /dev/null +++ b/teammerger/Debug/teammerger.tlog/teammerger.lastbuildstate @@ -0,0 +1,2 @@ +PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.26.28801:TargetPlatformVersion=10.0.18362.0: +Debug|Win32|D:\VSC++\C++wen jian\teammerger\| diff --git a/teammerger/Debug/teammerger.vcxproj.FileListAbsolute.txt b/teammerger/Debug/teammerger.vcxproj.FileListAbsolute.txt new file mode 100644 index 0000000..913b904 --- /dev/null +++ b/teammerger/Debug/teammerger.vcxproj.FileListAbsolute.txt @@ -0,0 +1,2 @@ +D:\VSC++\C++wen jian\teammerger\Debug\teammerger.exe +D:\VSC++\C++wen jian\teammerger\Debug\teammerger.pdb diff --git a/teammerger/Debug/vc142.idb b/teammerger/Debug/vc142.idb new file mode 100644 index 0000000..ae7ff6c Binary files /dev/null and b/teammerger/Debug/vc142.idb differ diff --git a/teammerger/Debug/vc142.pdb b/teammerger/Debug/vc142.pdb new file mode 100644 index 0000000..0afc035 Binary files /dev/null and b/teammerger/Debug/vc142.pdb differ diff --git a/teammerger/a.h b/teammerger/a.h new file mode 100644 index 0000000..7897820 --- /dev/null +++ b/teammerger/a.h @@ -0,0 +1,8 @@ +#pragma once +#include +#include +using namespace std; +double powe(int x) +{ + return exp(x); +} diff --git a/teammerger/b.h b/teammerger/b.h new file mode 100644 index 0000000..8869c73 --- /dev/null +++ b/teammerger/b.h @@ -0,0 +1,7 @@ +#include +#include +using namespace std; +double coun(double a,double x) +{ + return log(x)/log(a); //logax = log(x)/log(a) +} diff --git a/teammerger/c.h b/teammerger/c.h new file mode 100644 index 0000000..94ea406 --- /dev/null +++ b/teammerger/c.h @@ -0,0 +1,35 @@ +#pragma once +#include + +#include + +#include + +#include + +#include + +#include + +using namespace std; + +stack opr; + +stack in; + +std::map m; + +double compute(double a, double b, char c) + +{ + + if (c == '+') return a + b; + + else if (c == '-') return a - b; + + else if (c == '*') return a * b; + + else if (c == '/') return a / b; + +} + diff --git a/teammerger/d.h b/teammerger/d.h new file mode 100644 index 0000000..4ecf7ee --- /dev/null +++ b/teammerger/d.h @@ -0,0 +1,4 @@ +#pragma once +#include +#include +using namespace std; diff --git a/teammerger/merger.cpp b/teammerger/merger.cpp new file mode 100644 index 0000000..eb1e27c --- /dev/null +++ b/teammerger/merger.cpp @@ -0,0 +1,16 @@ +#include +#include +#include "a.h" +#include "b.h" +#include "c.h" +#include "d.h" +using namespace std; +int main() +{ + cout << powe(2) << "_Aдһe^xa.hpp"< + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {1cfa0810-fcdd-461d-a45c-c427de9542b6} + teammerger + 10.0 + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/teammerger/teammerger.vcxproj.filters b/teammerger/teammerger.vcxproj.filters new file mode 100644 index 0000000..19f1151 --- /dev/null +++ b/teammerger/teammerger.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + 头文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + + + 源文件 + + + \ No newline at end of file diff --git a/teammerger/teammerger.vcxproj.user b/teammerger/teammerger.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/teammerger/teammerger.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file