IGNITE-5132: Fixed PutGet example.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed72663f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed72663f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed72663f Branch: refs/heads/ignite-5075 Commit: ed72663ff8e6b6f46d77c91471400ec1c9ff0dfa Parents: 85f5309 Author: Igor Sapego <[email protected]> Authored: Tue May 2 20:20:49 2017 +0300 Committer: Igor Sapego <[email protected]> Committed: Wed May 3 16:14:20 2017 +0300 ---------------------------------------------------------------------- .../common/os/win/include/ignite/common/concurrent_os.h | 2 +- .../cpp/examples/putget-example/config/example-cache.xml | 10 +--------- .../putget-example/project/vs/putget-example.vcxproj | 3 +++ .../project/vs/putget-example.vcxproj.filters | 8 ++++++++ .../cpp/examples/putget-example/src/putget_example.cpp | 2 +- .../query-example/project/vs/query-example.vcxproj | 3 +++ .../project/vs/query-example.vcxproj.filters | 8 ++++++++ 7 files changed, 25 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ed72663f/modules/platforms/cpp/common/os/win/include/ignite/common/concurrent_os.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/common/os/win/include/ignite/common/concurrent_os.h b/modules/platforms/cpp/common/os/win/include/ignite/common/concurrent_os.h index 54f611b..0822ba7 100644 --- a/modules/platforms/cpp/common/os/win/include/ignite/common/concurrent_os.h +++ b/modules/platforms/cpp/common/os/win/include/ignite/common/concurrent_os.h @@ -35,7 +35,7 @@ namespace ignite /** * Static class to manage memory visibility semantics. */ - class Memory + class IGNITE_IMPORT_EXPORT Memory { public: /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ed72663f/modules/platforms/cpp/examples/putget-example/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/examples/putget-example/config/example-cache.xml b/modules/platforms/cpp/examples/putget-example/config/example-cache.xml index 28b726c..af523cd 100644 --- a/modules/platforms/cpp/examples/putget-example/config/example-cache.xml +++ b/modules/platforms/cpp/examples/putget-example/config/example-cache.xml @@ -35,18 +35,10 @@ Partitioned cache example configuration with binary objects enabled. --> <bean class="org.apache.ignite.configuration.CacheConfiguration"> + <property name="name" value="atomic"/> <property name="atomicityMode" value="ATOMIC"/> <property name="backups" value="1"/> </bean> - - <!-- - Partitioned cache example configuration. - --> - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="tx"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="backups" value="1"/> - </bean> </list> </property> http://git-wip-us.apache.org/repos/asf/ignite/blob/ed72663f/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj b/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj index 555e15a..8842f3a 100644 --- a/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj +++ b/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj @@ -101,6 +101,9 @@ copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.co <ClInclude Include="..\..\..\include\ignite\examples\address.h" /> <ClInclude Include="..\..\..\include\ignite\examples\organization.h" /> </ItemGroup> + <ItemGroup> + <None Include="..\..\config\example-cache.xml" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> http://git-wip-us.apache.org/repos/asf/ignite/blob/ed72663f/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj.filters ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj.filters b/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj.filters index 1bcaff5..3bb8a8f 100644 --- a/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj.filters +++ b/modules/platforms/cpp/examples/putget-example/project/vs/putget-example.vcxproj.filters @@ -13,6 +13,9 @@ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> </Filter> + <Filter Include="Config"> + <UniqueIdentifier>{487c5422-915c-4851-892d-c1599ea69e0c}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\src\putget_example.cpp"> @@ -27,4 +30,9 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> + <ItemGroup> + <None Include="..\..\config\example-cache.xml"> + <Filter>Config</Filter> + </None> + </ItemGroup> </Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/ed72663f/modules/platforms/cpp/examples/putget-example/src/putget_example.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/examples/putget-example/src/putget_example.cpp b/modules/platforms/cpp/examples/putget-example/src/putget_example.cpp index 8bf9c8c..f7bd894 100644 --- a/modules/platforms/cpp/examples/putget-example/src/putget_example.cpp +++ b/modules/platforms/cpp/examples/putget-example/src/putget_example.cpp @@ -100,7 +100,7 @@ int main() std::cout << std::endl; // Get cache instance. - Cache<int, Organization> cache = grid.GetCache<int, Organization>(NULL); + Cache<int, Organization> cache = grid.GetCache<int, Organization>("atomic"); // Clear cache. cache.Clear(); http://git-wip-us.apache.org/repos/asf/ignite/blob/ed72663f/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj b/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj index ff8e5be..22aa2b9 100644 --- a/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj +++ b/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj @@ -102,6 +102,9 @@ copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.co <ClInclude Include="..\..\..\include\ignite\examples\organization.h" /> <ClInclude Include="..\..\..\include\ignite\examples\person.h" /> </ItemGroup> + <ItemGroup> + <None Include="..\..\config\query-example.xml" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> http://git-wip-us.apache.org/repos/asf/ignite/blob/ed72663f/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj.filters ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj.filters b/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj.filters index 219d3f4..506b255 100644 --- a/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj.filters +++ b/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj.filters @@ -18,10 +18,18 @@ <Filter Include="Header Files"> <UniqueIdentifier>{b355095f-b4e2-4324-9516-854828c876ff}</UniqueIdentifier> </Filter> + <Filter Include="Config"> + <UniqueIdentifier>{89a5a9cc-a2c9-4d11-9044-869c3af6a2fd}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\src\query_example.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> + <ItemGroup> + <None Include="..\..\config\query-example.xml"> + <Filter>Config</Filter> + </None> + </ItemGroup> </Project> \ No newline at end of file
