Skip to content

Commit 168eaa3

Browse files
AlinshansAlinshans
authored
Merge pull request #50 from Alinshans/v2
Ⓜ️ Modify the VS files location.
2 parents a68aa05 + 09766b0 commit 168eaa3

File tree

5 files changed

+89
-89
lines changed

5 files changed

+89
-89
lines changed

MyTinySTL.sln renamed to MSVC/MyTinySTL_VS2015.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MyTinySTL", "MyTinySTL\MyTinySTL.vcxproj", "{E88807F6-B07C-4371-BD38-FB1569F894E4}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MyTinySTL", "MyTinySTL_VS2015.vcxproj", "{E88807F6-B07C-4371-BD38-FB1569F894E4}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

MyTinySTL/MyTinySTL.vcxproj renamed to MSVC/MyTinySTL_VS2015.vcxproj

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -162,35 +162,35 @@
162162
<ClInclude Include="..\Test\unordered_map_test.h" />
163163
<ClInclude Include="..\Test\unordered_set_test.h" />
164164
<ClInclude Include="..\Test\vector_test.h" />
165-
<ClInclude Include="algo.h" />
166-
<ClInclude Include="algobase.h" />
167-
<ClInclude Include="algorithm.h" />
168-
<ClInclude Include="alloc.h" />
169-
<ClInclude Include="allocator.h" />
170-
<ClInclude Include="basic_string.h" />
171-
<ClInclude Include="construct.h" />
172-
<ClInclude Include="deque.h" />
173-
<ClInclude Include="exceptdef.h" />
174-
<ClInclude Include="functional.h" />
175-
<ClInclude Include="hashtable.h" />
176-
<ClInclude Include="unordered_map.h" />
177-
<ClInclude Include="unordered_set.h" />
178-
<ClInclude Include="heap_algo.h" />
179-
<ClInclude Include="iterator.h" />
180-
<ClInclude Include="list.h" />
181-
<ClInclude Include="map.h" />
182-
<ClInclude Include="memory.h" />
183-
<ClInclude Include="numeric.h" />
184-
<ClInclude Include="queue.h" />
185-
<ClInclude Include="rb_tree.h" />
186-
<ClInclude Include="set.h" />
187-
<ClInclude Include="set_algo.h" />
188-
<ClInclude Include="stack.h" />
189-
<ClInclude Include="astring.h" />
190-
<ClInclude Include="type_traits.h" />
191-
<ClInclude Include="uninitialized.h" />
192-
<ClInclude Include="util.h" />
193-
<ClInclude Include="vector.h" />
165+
<ClInclude Include="..\MyTinySTL\algo.h" />
166+
<ClInclude Include="..\MyTinySTL\algobase.h" />
167+
<ClInclude Include="..\MyTinySTL\algorithm.h" />
168+
<ClInclude Include="..\MyTinySTL\alloc.h" />
169+
<ClInclude Include="..\MyTinySTL\allocator.h" />
170+
<ClInclude Include="..\MyTinySTL\basic_string.h" />
171+
<ClInclude Include="..\MyTinySTL\construct.h" />
172+
<ClInclude Include="..\MyTinySTL\deque.h" />
173+
<ClInclude Include="..\MyTinySTL\exceptdef.h" />
174+
<ClInclude Include="..\MyTinySTL\functional.h" />
175+
<ClInclude Include="..\MyTinySTL\hashtable.h" />
176+
<ClInclude Include="..\MyTinySTL\unordered_map.h" />
177+
<ClInclude Include="..\MyTinySTL\unordered_set.h" />
178+
<ClInclude Include="..\MyTinySTL\heap_algo.h" />
179+
<ClInclude Include="..\MyTinySTL\iterator.h" />
180+
<ClInclude Include="..\MyTinySTL\list.h" />
181+
<ClInclude Include="..\MyTinySTL\map.h" />
182+
<ClInclude Include="..\MyTinySTL\memory.h" />
183+
<ClInclude Include="..\MyTinySTL\numeric.h" />
184+
<ClInclude Include="..\MyTinySTL\queue.h" />
185+
<ClInclude Include="..\MyTinySTL\rb_tree.h" />
186+
<ClInclude Include="..\MyTinySTL\set.h" />
187+
<ClInclude Include="..\MyTinySTL\set_algo.h" />
188+
<ClInclude Include="..\MyTinySTL\stack.h" />
189+
<ClInclude Include="..\MyTinySTL\astring.h" />
190+
<ClInclude Include="..\MyTinySTL\type_traits.h" />
191+
<ClInclude Include="..\MyTinySTL\uninitialized.h" />
192+
<ClInclude Include="..\MyTinySTL\util.h" />
193+
<ClInclude Include="..\MyTinySTL\vector.h" />
194194
</ItemGroup>
195195
<ItemGroup>
196196
<ClCompile Include="..\Test\test.cpp" />

MyTinySTL/MyTinySTL.vcxproj.filters renamed to MSVC/MyTinySTL_VS2015.vcxproj.filters

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
66
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
77
</Filter>
8-
<Filter Include="Test">
9-
<UniqueIdentifier>{ec314ff3-dcde-4cac-a63a-4f6827750d0a}</UniqueIdentifier>
10-
</Filter>
11-
<Filter Include="Test\Lib">
12-
<UniqueIdentifier>{c6f24d77-e6f0-439e-954a-c0ca577689d5}</UniqueIdentifier>
13-
</Filter>
148
<Filter Include="include">
159
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
1610
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
@@ -19,144 +13,150 @@
1913
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
2014
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
2115
</Filter>
16+
<Filter Include="test">
17+
<UniqueIdentifier>{ec314ff3-dcde-4cac-a63a-4f6827750d0a}</UniqueIdentifier>
18+
</Filter>
19+
<Filter Include="test\Lib">
20+
<UniqueIdentifier>{c6f24d77-e6f0-439e-954a-c0ca577689d5}</UniqueIdentifier>
21+
</Filter>
2222
</ItemGroup>
2323
<ItemGroup>
24-
<ClInclude Include="type_traits.h">
24+
<ClInclude Include="..\MyTinySTL\type_traits.h">
2525
<Filter>include</Filter>
2626
</ClInclude>
27-
<ClInclude Include="construct.h">
27+
<ClInclude Include="..\MyTinySTL\construct.h">
2828
<Filter>include</Filter>
2929
</ClInclude>
30-
<ClInclude Include="alloc.h">
30+
<ClInclude Include="..\MyTinySTL\alloc.h">
3131
<Filter>include</Filter>
3232
</ClInclude>
33-
<ClInclude Include="allocator.h">
33+
<ClInclude Include="..\MyTinySTL\allocator.h">
3434
<Filter>include</Filter>
3535
</ClInclude>
36-
<ClInclude Include="uninitialized.h">
36+
<ClInclude Include="..\MyTinySTL\uninitialized.h">
3737
<Filter>include</Filter>
3838
</ClInclude>
39-
<ClInclude Include="iterator.h">
39+
<ClInclude Include="..\MyTinySTL\iterator.h">
4040
<Filter>include</Filter>
4141
</ClInclude>
42-
<ClInclude Include="numeric.h">
42+
<ClInclude Include="..\MyTinySTL\numeric.h">
4343
<Filter>include</Filter>
4444
</ClInclude>
45-
<ClInclude Include="algobase.h">
45+
<ClInclude Include="..\MyTinySTL\algobase.h">
4646
<Filter>include</Filter>
4747
</ClInclude>
48-
<ClInclude Include="heap_algo.h">
48+
<ClInclude Include="..\MyTinySTL\heap_algo.h">
4949
<Filter>include</Filter>
5050
</ClInclude>
51-
<ClInclude Include="set_algo.h">
51+
<ClInclude Include="..\MyTinySTL\set_algo.h">
5252
<Filter>include</Filter>
5353
</ClInclude>
54-
<ClInclude Include="algo.h">
54+
<ClInclude Include="..\MyTinySTL\algo.h">
5555
<Filter>include</Filter>
5656
</ClInclude>
57-
<ClInclude Include="algorithm.h">
57+
<ClInclude Include="..\MyTinySTL\algorithm.h">
5858
<Filter>include</Filter>
5959
</ClInclude>
60-
<ClInclude Include="vector.h">
60+
<ClInclude Include="..\MyTinySTL\vector.h">
6161
<Filter>include</Filter>
6262
</ClInclude>
63-
<ClInclude Include="memory.h">
63+
<ClInclude Include="..\MyTinySTL\memory.h">
6464
<Filter>include</Filter>
6565
</ClInclude>
66-
<ClInclude Include="list.h">
66+
<ClInclude Include="..\MyTinySTL\list.h">
6767
<Filter>include</Filter>
6868
</ClInclude>
69-
<ClInclude Include="deque.h">
69+
<ClInclude Include="..\MyTinySTL\deque.h">
7070
<Filter>include</Filter>
7171
</ClInclude>
72-
<ClInclude Include="stack.h">
72+
<ClInclude Include="..\MyTinySTL\stack.h">
7373
<Filter>include</Filter>
7474
</ClInclude>
75-
<ClInclude Include="queue.h">
75+
<ClInclude Include="..\MyTinySTL\queue.h">
7676
<Filter>include</Filter>
7777
</ClInclude>
78-
<ClInclude Include="functional.h">
78+
<ClInclude Include="..\MyTinySTL\functional.h">
7979
<Filter>include</Filter>
8080
</ClInclude>
81-
<ClInclude Include="rb_tree.h">
81+
<ClInclude Include="..\MyTinySTL\rb_tree.h">
8282
<Filter>include</Filter>
8383
</ClInclude>
84-
<ClInclude Include="set.h">
84+
<ClInclude Include="..\MyTinySTL\set.h">
8585
<Filter>include</Filter>
8686
</ClInclude>
87-
<ClInclude Include="map.h">
87+
<ClInclude Include="..\MyTinySTL\map.h">
8888
<Filter>include</Filter>
8989
</ClInclude>
90-
<ClInclude Include="hashtable.h">
90+
<ClInclude Include="..\MyTinySTL\hashtable.h">
9191
<Filter>include</Filter>
9292
</ClInclude>
93-
<ClInclude Include="basic_string.h">
93+
<ClInclude Include="..\MyTinySTL\basic_string.h">
9494
<Filter>include</Filter>
9595
</ClInclude>
96-
<ClInclude Include="unordered_set.h">
96+
<ClInclude Include="..\MyTinySTL\unordered_set.h">
9797
<Filter>include</Filter>
9898
</ClInclude>
99-
<ClInclude Include="unordered_map.h">
99+
<ClInclude Include="..\MyTinySTL\unordered_map.h">
100100
<Filter>include</Filter>
101101
</ClInclude>
102102
<ClInclude Include="..\Test\algorithm_performance_test.h">
103-
<Filter>Test</Filter>
103+
<Filter>test</Filter>
104104
</ClInclude>
105105
<ClInclude Include="..\Test\algorithm_test.h">
106-
<Filter>Test</Filter>
106+
<Filter>test</Filter>
107107
</ClInclude>
108108
<ClInclude Include="..\Test\deque_test.h">
109-
<Filter>Test</Filter>
109+
<Filter>test</Filter>
110110
</ClInclude>
111111
<ClInclude Include="..\Test\list_test.h">
112-
<Filter>Test</Filter>
112+
<Filter>test</Filter>
113113
</ClInclude>
114114
<ClInclude Include="..\Test\map_test.h">
115-
<Filter>Test</Filter>
115+
<Filter>test</Filter>
116116
</ClInclude>
117117
<ClInclude Include="..\Test\queue_test.h">
118-
<Filter>Test</Filter>
118+
<Filter>test</Filter>
119119
</ClInclude>
120120
<ClInclude Include="..\Test\set_test.h">
121-
<Filter>Test</Filter>
121+
<Filter>test</Filter>
122122
</ClInclude>
123123
<ClInclude Include="..\Test\stack_test.h">
124-
<Filter>Test</Filter>
124+
<Filter>test</Filter>
125125
</ClInclude>
126126
<ClInclude Include="..\Test\string_test.h">
127-
<Filter>Test</Filter>
127+
<Filter>test</Filter>
128128
</ClInclude>
129129
<ClInclude Include="..\Test\test.h">
130-
<Filter>Test</Filter>
130+
<Filter>test</Filter>
131131
</ClInclude>
132132
<ClInclude Include="..\Test\unordered_map_test.h">
133-
<Filter>Test</Filter>
133+
<Filter>test</Filter>
134134
</ClInclude>
135135
<ClInclude Include="..\Test\unordered_set_test.h">
136-
<Filter>Test</Filter>
136+
<Filter>test</Filter>
137137
</ClInclude>
138138
<ClInclude Include="..\Test\vector_test.h">
139-
<Filter>Test</Filter>
139+
<Filter>test</Filter>
140140
</ClInclude>
141141
<ClInclude Include="..\Test\Lib\redbud\platform.h">
142-
<Filter>Test\Lib</Filter>
142+
<Filter>test\Lib</Filter>
143143
</ClInclude>
144144
<ClInclude Include="..\Test\Lib\redbud\io\color.h">
145-
<Filter>Test\Lib</Filter>
145+
<Filter>test\Lib</Filter>
146146
</ClInclude>
147-
<ClInclude Include="astring.h">
147+
<ClInclude Include="..\MyTinySTL\astring.h">
148148
<Filter>include</Filter>
149149
</ClInclude>
150-
<ClInclude Include="util.h">
150+
<ClInclude Include="..\MyTinySTL\util.h">
151151
<Filter>include</Filter>
152152
</ClInclude>
153-
<ClInclude Include="exceptdef.h">
153+
<ClInclude Include="..\MyTinySTL\exceptdef.h">
154154
<Filter>include</Filter>
155155
</ClInclude>
156156
</ItemGroup>
157157
<ItemGroup>
158158
<ClCompile Include="..\Test\test.cpp">
159-
<Filter>Test</Filter>
159+
<Filter>test</Filter>
160160
</ClCompile>
161161
</ItemGroup>
162162
</Project>

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ MyTinySTL
2323

2424
如果你想要运行测试，请先阅读 [这个](https://github.com/Alinshans/MyTinySTL/blob/master/Test/README.md) 。
2525

26-
* linux/osx
26+
* gcc/clang on linux/osx
2727
1. 克隆仓库
2828
```bash
2929
$ git clone git@github.com:Alinshans/MyTinySTL.git
@@ -37,9 +37,9 @@ $ make
3737
$ cd ../bin && ./stltest
3838
```
3939

40-
* windows
40+
* msvc on windows
4141
1. 克隆仓库或 [Download ZIP](https://github.com/Alinshans/MyTinySTL/archive/master.zip)
42-
2. 使用 `vs2015`（或 `vs2017`）打开 `MyTinySTL.sln`，配置成 `Release` 模式，（Ctrl + F5）开始执行。
42+
2. 使用 `vs2015`（或 `vs2017`）打开 `MSVC/MyTinySTL_VS2015.sln`，配置成 `Release` 模式，（Ctrl + F5）开始执行。
4343

4444
## 文档
4545
见 [Wiki](https://github.com/Alinshans/MyTinySTL/wiki)。
@@ -72,7 +72,7 @@ This is a `tinySTL` based on `C++11`, which is my first project for practice. I
7272

7373
If you want to run the test, please read [this](https://github.com/Alinshans/MyTinySTL/blob/master/Test/README.md) first.
7474

75-
* linux/osx
75+
* gcc/clang on linux/osx
7676

7777
1. git clone
7878
```bash
@@ -87,10 +87,10 @@ $ make
8787
$ cd ../bin && ./stltest
8888
```
8989

90-
* windows
90+
* msvc on windows
9191

9292
1. git clone or [Download ZIP](https://github.com/Alinshans/MyTinySTL/archive/master.zip)
93-
2. use `vs2015`(or `vs2017`) open the file `MyTinySTL.sln`, configured in `Release`, run this project(Ctrl + F5).
93+
2. use `vs2015`(or `vs2017`) open the file `MSVC/MyTinySTL_VS2015.sln`, configured in `Release`, run this project(Ctrl + F5).
9494

9595
## Documents
9696

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ configuration:
1111

1212
build:
1313
parallel: true
14-
project: MyTinySTL.sln
14+
project: MSVC\MyTinySTL_VS2015.sln
1515

1616
test_script:
17-
- cmd: cd .\x64\Release\
17+
- cmd: cd .\MSVC\x64\Release\
1818
- cmd: MyTinySTL.exe
1919

2020
notifications:

0 commit comments

Comments
 (0)