merging conflicts

quantum/gate/scaffold/ScaffoldCompiler.cpp

+/***********************************************************************************
+ * Copyright (c) 2016, UT-Battelle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of the xacc nor the
+ *     names of its contributors may be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributors:
+ *   Initial API and implementation - Alex McCaskey
+ *
+ **********************************************************************************/
 #include "ScaffoldCompiler.hpp"
 #include "GraphIR.hpp"
 #include <regex>

quantum/gate/scaffold/tests/ScaffoldCompilerTester.cpp

@@ -102,5 +102,4 @@ BOOST_AUTO_TEST_CASE(checkAnotherSimpleCompile) {
 
 	// Scaffold decomposes Rz into H and T gates.
 	BOOST_VERIFY(graphir->order() > 1400);
-
 }

common @ f6c8110d

-Subproject commit 53b9b4d691309573d1ebb3f08de838c3b31b1c3a
+Subproject commit f6c8110dd0d284d39f7f912170fb2f0fbab92a68

xacc/compiler/GraphIR.hpp

@@ -37,11 +37,7 @@
 namespace xacc {
 
 template<typename DerivedGraph>
-class GraphIR: public IR {
-
-protected:
-
-	DerivedGraph graph;
+class GraphIR : public IR {
 
 public: