Merge branch 'upstream' into fork

3862202e · Justin MacCallum · e1a4e015 · 73882ac5 · 3862202e · 3862202e
Commit 3862202e authored Jul 12, 2013 by Justin MacCallum
20 changed files
--- a/platforms/reference/src/SimTKReference/ReferenceAngleBondIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceAngleBondIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceBondForce.h
+++ b/platforms/reference/src/SimTKReference/ReferenceBondForce.h
--- a/platforms/reference/src/SimTKReference/ReferenceBondIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceBondIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceBrownianDynamics.h
+++ b/platforms/reference/src/SimTKReference/ReferenceBrownianDynamics.h
--- a/platforms/reference/src/SimTKReference/ReferenceCCMAAlgorithm.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCCMAAlgorithm.h
--- a/platforms/reference/src/SimTKReference/ReferenceCMAPTorsionIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCMAPTorsionIxn.h
@@ -25,8 +25,8 @@
 #ifndef __ReferenceCMAPTorsionIxn_H__
 #define __ReferenceCMAPTorsionIxn_H__

-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKUtilities/SimTKOpenMMUtilities.h"
+#include "SimTKOpenMMCommon.h"
+#include "SimTKOpenMMUtilities.h"
 #include "ReferenceBondIxn.h"
 #include <vector>


--- a/platforms/reference/src/SimTKReference/ReferenceConstraint.h
+++ b/platforms/reference/src/SimTKReference/ReferenceConstraint.h
--- a/platforms/reference/src/SimTKReference/ReferenceConstraintAlgorithm.h
+++ b/platforms/reference/src/SimTKReference/ReferenceConstraintAlgorithm.h
@@ -25,7 +25,7 @@
 #ifndef __ReferenceConstraintAlgorithm_H__
 #define __ReferenceConstraintAlgorithm_H__

-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 #include "openmm/internal/windowsExport.h"

 /**

--- a/platforms/reference/src/SimTKReference/ReferenceCustomAngleIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomAngleIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceCustomBondIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomBondIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceCustomCompoundBondIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomCompoundBondIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceCustomDynamics.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomDynamics.h
--- a/platforms/reference/src/SimTKReference/ReferenceCustomExternalIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomExternalIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceCustomGBIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomGBIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceCustomHbondIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomHbondIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceCustomNonbondedIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomNonbondedIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceCustomTorsionIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomTorsionIxn.h
--- a/platforms/reference/src/SimTKReference/ReferenceDynamics.h
+++ b/platforms/reference/src/SimTKReference/ReferenceDynamics.h
@@ -26,7 +26,7 @@
 #define __ReferenceDynamics_H__

 #include "ReferenceConstraintAlgorithm.h"
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 #include "openmm/System.h"
 #include <cstddef>
 #include <vector>

--- a/platforms/reference/src/SimTKReference/ReferenceForce.h
+++ b/platforms/reference/src/SimTKReference/ReferenceForce.h
@@ -25,7 +25,7 @@
 #ifndef __ReferenceForce_H__
 #define __ReferenceForce_H__

-#include "../../../../openmmapi/include/openmm/internal/windowsExport.h"
+#include "openmm/internal/windowsExport.h"

 // ---------------------------------------------------------------------------------------


--- a/platforms/reference/src/SimTKReference/ReferenceHarmonicBondIxn.h
+++ b/platforms/reference/src/SimTKReference/ReferenceHarmonicBondIxn.h