Skip to content

Commit

Permalink
Merge pull request #999 from leapmotion/dep-libstdcpp-xcode
Browse files Browse the repository at this point in the history
Remove legacy support for Xcode + libstdc++
  • Loading branch information
hham committed Sep 29, 2016
2 parents 177a111 + 876bc7a commit 78bf34d
Show file tree
Hide file tree
Showing 15 changed files with 33 additions and 390 deletions.
14 changes: 2 additions & 12 deletions Autowiring.nuspec.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A C++11 Concurrent Inversion of Control framework</description>
<summary>Autowiring is an inversion-of-control framework for C++11. It provides a declarative way to manage resources through dependency injection.</summary>
<copyright>Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved.</copyright>
<copyright>Copyright (C) 2012-2016 Leap Motion, Inc. All rights reserved.</copyright>
<language>en-US</language>
<tags>c++ ioc concurrent c++11</tags>
<dependencies>
Expand All @@ -18,27 +18,17 @@
</metadata>
<files>
<file src="autowiring\C++11\boost_array.h" target="build\native\include\autowiring\C++11\boost_array.h" />
<file src="autowiring\C++11\boost_atomic.h" target="build\native\include\autowiring\C++11\boost_atomic.h" />
<file src="autowiring\C++11\boost_chrono.h" target="build\native\include\autowiring\C++11\boost_chrono.h" />
<file src="autowiring\C++11\boost_exception_ptr.h" target="build\native\include\autowiring\C++11\boost_exception_ptr.h" />
<file src="autowiring\C++11\boost_functional.h" target="build\native\include\autowiring\C++11\boost_functional.h" />
<file src="autowiring\C++11\boost_future.h" target="build\native\include\autowiring\C++11\boost_future.h" />
<file src="autowiring\C++11\boost_mutex.h" target="build\native\include\autowiring\C++11\boost_mutex.h" />
<file src="autowiring\C++11\boost_rvalue.h" target="build\native\include\autowiring\C++11\boost_rvalue.h" />
<file src="autowiring\C++11\boost_shared_ptr.h" target="build\native\include\autowiring\C++11\boost_shared_ptr.h" />
<file src="autowiring\C++11\boost_system_error.h" target="build\native\include\autowiring\C++11\boost_system_error.h" />
<file src="autowiring\C++11\boost_thread.h" target="build\native\include\autowiring\C++11\boost_thread.h" />
<file src="autowiring\C++11\boost_tuple.h" target="build\native\include\autowiring\C++11\boost_tuple.h" />
<file src="autowiring\C++11\boost_type_traits.h" target="build\native\include\autowiring\C++11\boost_type_traits.h" />
<file src="autowiring\C++11\boost_utility.h" target="build\native\include\autowiring\C++11\boost_utility.h" />
<file src="autowiring\C++11\cpp11.h" target="build\native\include\autowiring\C++11\cpp11.h" />
<file src="autowiring\C++11\empty_file.h" target="build\native\include\autowiring\C++11\empty_file.h" />
<file src="autowiring\C++11\make_unique.h" target="build\native\include\autowiring\C++11\make_unique.h" />
<file src="autowiring\C++11\memory.h" target="build\native\include\autowiring\C++11\memory.h" />
<file src="autowiring\C++11\memory_nostl11.h" target="build\native\include\autowiring\C++11\memory_nostl11.h" />
<file src="autowiring\C++11\mutex.h" target="build\native\include\autowiring\C++11\mutex.h" />
<file src="autowiring\C++11\README.md" target="build\native\include\autowiring\C++11\README.md" />
<file src="autowiring\C++11\type_index.h" target="build\native\include\autowiring\C++11\type_index.h" />
<file src="autowiring\C++11\unique_ptr.h" target="build\native\include\autowiring\C++11\unique_ptr.h" />
<file src="autowiring\AnySharedPointer.h" target="build\native\include\autowiring\AnySharedPointer.h" />
<file src="autowiring\atomic_object.h" target="build\native\include\autowiring\atomic_object.h" />
Expand Down Expand Up @@ -189,4 +179,4 @@
<file src="nuget\tools\init.ps1" target="tools\init.ps1" />
<file src="nuget\tools\autowiring.natvis" target="tools\autowiring.natvis" />
</files>
</package>
</package>
18 changes: 0 additions & 18 deletions src/autowiring/C++11/boost_atomic.h

This file was deleted.

10 changes: 0 additions & 10 deletions src/autowiring/C++11/boost_chrono.h

This file was deleted.

21 changes: 0 additions & 21 deletions src/autowiring/C++11/boost_mutex.h

This file was deleted.

9 changes: 0 additions & 9 deletions src/autowiring/C++11/boost_rvalue.h

This file was deleted.

17 changes: 0 additions & 17 deletions src/autowiring/C++11/boost_system_error.h

This file was deleted.

9 changes: 0 additions & 9 deletions src/autowiring/C++11/boost_thread.h

This file was deleted.

78 changes: 0 additions & 78 deletions src/autowiring/C++11/boost_tuple.h

This file was deleted.

8 changes: 0 additions & 8 deletions src/autowiring/C++11/boost_utility.h

This file was deleted.

6 changes: 1 addition & 5 deletions src/autowiring/C++11/chrono_with_profiling_clock.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
// Copyright (C) 2012-2016 Leap Motion, Inc. All rights reserved.
#pragma once

#if STL11_ALLOWED
#include <chrono>
#else
#include <autowiring/C++11/boost_chrono.h>
#endif
#include <chrono>

// This solution taken from http://stackoverflow.com/questions/8386128/how-to-get-the-precision-of-high-resolution-clock
// Hopefully it will be able to be depricated when VS2015 hits.
Expand Down

0 comments on commit 78bf34d

Please sign in to comment.