From 8cab209ef91cbda34bae8afa880f152c4f1473b0 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Thu, 1 Oct 2015 17:35:26 +0200
Subject: [PUSB] Fix static initialization order fiasco

For details see:
https://isocpp.org/wiki/faq/ctors#static-init-order-on-first-use
---
 cores/arduino/PluggableUSB.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'cores/arduino/PluggableUSB.cpp')

diff --git a/cores/arduino/PluggableUSB.cpp b/cores/arduino/PluggableUSB.cpp
index acc6276..582379a 100644
--- a/cores/arduino/PluggableUSB.cpp
+++ b/cores/arduino/PluggableUSB.cpp
@@ -25,8 +25,6 @@
 
 extern uint8_t _initEndpoints[];
 
-PluggableUSB_ PluggableUSB;
-
 int PluggableUSB_::getInterface(uint8_t* interfaceNum)
 {
 	int sent = 0;
@@ -90,6 +88,12 @@ bool PluggableUSB_::plug(PUSBListNode *node)
 	// restart USB layer???
 }
 
+PluggableUSB_& PluggableUSB()
+{
+	static PluggableUSB_ obj;
+	return obj;
+}
+
 PluggableUSB_::PluggableUSB_() : lastIf(CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT),
                                  lastEp(CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT),
                                  rootNode(NULL)
-- 
cgit v1.2.3-18-g5258