Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace all instances of Autowired.h with autowiring.h #856

Merged
merged 1 commit into from
Feb 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/AutoFilterExample.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <iostream>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion examples/AutoFilterTutorial.0.0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/// deal only with ordinary input and output.
///
/// This tutorial will define and instantiate a simple filter network.
#include <autowiring/Autowired.h> // Needed for Autowiring classes.
#include <autowiring/autowiring.h> // Needed for Autowiring classes.
#include <cmath> // Needed for std::round.
#include <cstdlib> // Needed for std::atof.
#include <iostream> // Needed for std::cout.
Expand Down
2 changes: 1 addition & 1 deletion examples/AutoFilterTutorial.1.0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/// - `const std::shared_ptr<const T>`
/// - `const std::shared_ptr<const T> &`
///
#include <autowiring/Autowired.h> // Needed for Autowiring classes.
#include <autowiring/autowiring.h> // Needed for Autowiring classes.
#include <iostream> // Needed for std::cout.
#include <string> // Needed for std::string.
#include <unordered_set> // Needed for std::unordered_set.
Expand Down
2 changes: 1 addition & 1 deletion examples/AutoNetExample.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autonet/AutoNetServer.h>
#include <iostream>
#include THREAD_HEADER
Expand Down
2 changes: 1 addition & 1 deletion examples/ContextExample.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <iostream>
#include <memory>

Expand Down
22 changes: 11 additions & 11 deletions examples/ThreadExample.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/CoreThread.h>
#include <iostream>
#include <memory>
Expand Down Expand Up @@ -30,35 +30,35 @@ class MyCoreThread:
};

int main(){

// The 2 main thread classes in Autowiring are the BasicThread and CoreThread.
// Classes that inherit from these types will have thread capabilities
// Both start when their enclosing context is 'initiated'. Threads injected
// after the context is initiated will start immediatly

AutoRequired<MyBasicThread> myBasic;

AutoCurrentContext ctxt;
ctxt->Initiate(); // myBasic->Run() starts now in its own thread

std::this_thread::sleep_for(std::chrono::milliseconds(250));

std::cout << "injecting a CoreThread" << std::endl;

// Types inheriting from CoreThread implement a dispatch queue in their 'run()'
// function. Lambdas can be appended with operator+=

AutoRequired<MyCoreThread> myCore;
myCore->AddToQueue(42);
myCore->AddToQueue(1337);

*myCore += []{
std::cout << "This gets run after '1337'" << std::endl;
};

// This should be run before 'myCore' is finished
std::cout << "This thread is faster\n";

// This will wait for all outstanding threads to finish before terminating the context
ctxt->SignalShutdown(true);
}
Expand Down
2 changes: 1 addition & 1 deletion src/autonet/test/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <gtest/gtest.h>

#ifdef _MSC_VER
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <thread>
#include <mutex>
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/AutowiringTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "TestFixtures/SimpleObject.hpp"
#include "TestFixtures/SimpleReceiver.hpp"
#include <autotesting/gtest-all-guard.hpp>
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/AutowiringDebug.h>
#include <autowiring/CoreThread.h>

Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/AutowiringUtilitiesTest.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include "stdafx.h"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/BasicThread.h>
#include <autowiring/CoreThread.h>
#include <autowiring/thread_specific_ptr.h>
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/BoltTest.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include "stdafx.h"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/Bolt.h>
#include "TestFixtures/SimpleObject.hpp"
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/ContextCleanupTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "stdafx.h"
#include "TestFixtures/SimpleObject.hpp"
#include "TestFixtures/SimpleThreaded.hpp"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/CoreContext.h>
#include THREAD_HEADER

Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/ContextMapTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "stdafx.h"
#include "TestFixtures/ExitRaceThreaded.hpp"
#include "TestFixtures/SimpleThreaded.hpp"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/ContextMap.h>
#include <string>
#include THREAD_HEADER
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/CoreThreadTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "stdafx.h"
#include "TestFixtures/SimpleThreaded.hpp"
#include <autowiring/at_exit.h>
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <algorithm>
#include THREAD_HEADER

Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/CurrentContextPusherTest.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include "stdafx.h"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/CoreContext.h>
#include <autowiring/CurrentContextPusher.h>
#include <thread>
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/GlobalInitTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "stdafx.h"
#include "GlobalInitTest.hpp"
#include "TestFixtures/SimpleObject.hpp"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/GlobalCoreContext.h>

void GlobalInitTest::SetUp(void) {
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/MultiInheritTest.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include "stdafx.h"
#include "TestFixtures/MultiInherit.hpp"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/CoreContext.h>

class MultiInheritTest:
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/OnceTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "stdafx.h"
#include "TestFixtures/SimpleObject.hpp"
#include "TestFixtures/SimpleThreaded.hpp"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/CoreContext.h>
#include <autowiring/once.h>
#include THREAD_HEADER
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/PostConstructTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "stdafx.h"
#include "TestFixtures/SimpleObject.hpp"
#include "HasForwardOnlyType.hpp"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/ContextMember.h>
#include THREAD_HEADER

Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/ScopeTest.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include "stdafx.h"
#include "TestFixtures/SimpleObject.hpp"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/GlobalCoreContext.h>

class ScopeTest:
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/TestFixtures/ExitRaceThreaded.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#pragma once
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/CoreThread.h>

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/test/TypeRegistryTest.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
#include "stdafx.h"
#include <autowiring/Autowired.h>
#include <autowiring/autowiring.h>
#include <autowiring/GlobalCoreContext.h>
#include <autowiring/TypeRegistry.h>

Expand Down